From: Florin Peter <github@florin-peter.de>
Date: Tue, 7 May 2013 20:19:58 +0000 (+0200)
Subject: Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~110
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f82fb0e160704138a5bd1482e7217aa85ee0b6e3;p=nextcloud-server.git

Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
---

f82fb0e160704138a5bd1482e7217aa85ee0b6e3