Björn Schießle 54eeb8b8fc fix merge conflict		2013-01-31 10:55:59 +01:00
..
files	fix merge conflict	2013-01-31 10:55:59 +01:00
files_encryption	[tx-robot] updated from transifex	2013-01-31 00:31:28 +01:00
files_external	[tx-robot] updated from transifex	2013-01-31 00:31:28 +01:00
files_sharing	merge master into filesystem	2013-01-30 19:24:24 +01:00
files_trashbin	keep mtime	2013-01-31 10:50:02 +01:00
files_versions	fix merge conflict	2013-01-31 10:55:59 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-31 00:31:28 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-31 00:31:28 +01:00