Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/util.php		2013-09-02 14:41:46 +02:00
..
files	Merge branch 'master' into sharing_mail_notification_master	2013-09-02 14:41:46 +02:00
files_encryption	[tx-robot] updated from transifex	2013-08-30 09:38:20 -04:00
files_external	Merge pull request #4489 from owncloud/clean-3rdparty-mess-master	2013-08-28 06:12:58 -07:00
files_sharing	[tx-robot] updated from transifex	2013-09-01 13:30:40 -04:00
files_trashbin	Merge pull request #4671 from owncloud/emptycontent	2013-09-01 17:47:55 -07:00
files_versions	[tx-robot] updated from transifex	2013-08-27 11:23:18 -04:00
user_ldap	[tx-robot] updated from transifex	2013-08-30 09:38:20 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-08-28 06:24:14 -04:00