From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 27 Mar 2015 13:58:33 +0000 (+0100)
Subject: Merge pull request #15265 from owncloud/enc2_fixes
X-Git-Tag: v8.1.0alpha1~134
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98bc1ad70a26a02f2c4ea87809613f9fb1dc31fd;p=nextcloud-server.git

Merge pull request #15265 from owncloud/enc2_fixes

core improvements for Encryption 2.0
---

98bc1ad70a26a02f2c4ea87809613f9fb1dc31fd