Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/private/util.php		2013-10-02 10:11:18 +02:00
..
files	Merge branch 'master' into sharing_mail_notification_master	2013-10-02 10:11:18 +02:00
files_encryption	Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled	2013-09-30 10:53:41 -07:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
files_trashbin	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
files_versions	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00