Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
files	merge conflicts ...	2013-07-10 12:41:53 +02:00
files_encryption	[tx-robot] updated from transifex	2013-07-09 02:12:22 +02:00
files_external	[tx-robot] updated from transifex	2013-07-10 02:20:59 +02:00
files_sharing	[tx-robot] updated from transifex	2013-07-09 02:12:22 +02:00
files_trashbin	merge conflicts ...	2013-07-10 12:41:53 +02:00
files_versions	[tx-robot] updated from transifex	2013-07-10 02:20:59 +02:00
user_ldap	LDAP: even better check for emptiness, fixes #3815	2013-07-10 11:39:47 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-07-09 02:12:22 +02:00