From: Florin Peter Date: Wed, 29 May 2013 17:19:40 +0000 (+0200) Subject: Merge branch 'master' into file_encryption_external_storage_fixes X-Git-Tag: v6.0.0alpha2~705^2~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1202ab9995e2fa2293bfb8017fc58ca6daa4fba2;p=nextcloud-server.git Merge branch 'master' into file_encryption_external_storage_fixes --- 1202ab9995e2fa2293bfb8017fc58ca6daa4fba2