Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation		2013-01-31 19:28:25 +01:00
..
files	Merge branch 'master' into navigation	2013-01-31 19:28:25 +01:00
files_encryption	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00
files_external	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00
files_sharing	merge master into filesystem	2013-01-30 19:24:24 +01:00
files_trashbin	adding l10n support to files_trashbin	2013-01-31 16:48:41 +01:00
files_versions	fix merge conflict	2013-01-31 10:55:59 +01:00
user_ldap	Merge pull request #1365 from owncloud/ldap_multiple_server	2013-01-31 09:24:45 -08:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00