Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-03-28 18:39:12 +01:00
..
files	Merge pull request #2575 from owncloud/fixing-1461-master	2013-03-28 10:01:39 -07:00
files_encryption	Merge branch 'master' into files_encryption	2013-03-28 18:39:12 +01:00
files_external	Files External: show display names instead of internal user names in Settings UI	2013-03-27 19:07:33 +01:00
files_sharing	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00
files_versions	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00
user_ldap	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-03-27 00:11:05 +01:00