Tom Needham 3c98f36121 Merge branch 'master' into ocs_api		2012-12-16 22:29:00 +00:00
..
files	Merge pull request #875 from owncloud/multiplefiles_json	2012-12-14 16:26:09 -08:00
files_encryption	[tx-robot] updated from transifex	2012-12-10 00:12:32 +01:00
files_external	[tx-robot] updated from transifex	2012-12-16 00:12:10 +01:00
files_sharing	Merge branch 'master' into ocs_api	2012-12-16 22:29:00 +00:00
files_versions	Fix some of "Closing brace must be on a line by itself"	2012-12-15 00:43:46 +01:00
user_ldap	[tx-robot] updated from transifex	2012-12-16 00:12:10 +01:00
user_webdavauth	Fix "Line indented incorrectly"	2012-12-15 00:43:46 +01:00