Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/files_external/lib/config.php		2013-01-26 21:51:18 +01:00
..
common.php	Update lib/filestorage/common.php	2013-01-26 19:44:09 +01:00
commontest.php	Checkstyle: many fixes	2012-11-02 19:53:02 +01:00
local.php	Merge branch 'master' into files_encryption	2013-01-05 17:22:01 +00:00
temporary.php	Merged branch 'master'	2012-10-16 16:57:07 +01:00