Thomas Müller c62dc4fa80 Merge branch 'master' into fixing-4011-master ... Conflicts: lib/connector/sabre/directory.php		2013-09-30 11:36:08 +02:00
..
aborteduploaddetectionplugin.php	expect unlinkto be called	2013-09-25 17:41:16 +02:00
file.php	adding test testSimplePutFailsOnRename()	2013-09-30 11:30:34 +02:00
objecttree.php	code cleanup	2013-09-27 13:41:23 +02:00
quotaplugin.php	adding unit tests for quota checks	2013-08-08 13:33:00 +02:00