Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on ... Conflicts: apps/files_external/js/google.js		2013-01-31 23:34:12 +01:00
..
files	Merge branch 'master' into from_live_to_on	2013-01-31 23:34:12 +01:00
files_encryption	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00
files_external	Merge branch 'master' into from_live_to_on	2013-01-31 23:34:12 +01:00
files_sharing	merge master into filesystem	2013-01-30 19:24:24 +01:00
files_trashbin	adding l10n support to files_trashbin	2013-01-31 16:48:41 +01:00
files_versions	fix merge conflict	2013-01-31 10:55:59 +01:00
user_ldap	spell check	2013-01-31 22:49:07 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-31 17:05:21 +01:00