Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617 ... Conflicts: settings/ajax/changepassword.php		2013-09-23 10:39:12 +02:00
..
files	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00
files_encryption	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	remove unneccessary lib in namespace	2013-09-20 16:46:33 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-09-22 12:58:42 -04:00
files_versions	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-22 12:58:42 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00