Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +02:00
..
files	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
files_encryption	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
files_external	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
files_sharing	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
files_trashbin	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
files_versions	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
user_ldap	LDAP: only connect to LDAP once on login	2013-08-17 12:16:51 +02:00
user_webdavauth	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00