Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload ... Conflicts: lib/base.php lib/filestorage.php		2011-07-29 20:42:24 +02:00
..
local.php	Merge branch 'master' of git://anongit.kde.org/owncloud into autoload	2011-07-29 20:42:24 +02:00