Sam Tuke b95bc663af Merge branch 'master' into files_encryption-style-fixes ... Conflicts: apps/files_encryption/lib/crypt.php apps/files_encryption/lib/util.php		2013-02-09 11:52:11 +00:00
..
files	Merge pull request #1560 from owncloud/fix_replacing	2013-02-09 03:28:40 -08:00
files_encryption	Merge branch 'master' into files_encryption-style-fixes	2013-02-09 11:52:11 +00:00
files_external	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
files_sharing	[tx-robot] updated from transifex	2013-02-07 00:11:04 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-02-09 00:14:08 +01:00
files_versions	[tx-robot] updated from transifex	2013-02-09 00:14:08 +01:00
user_ldap	[tx-robot] updated from transifex	2013-02-09 00:14:08 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00