From: Florin Peter <github@florin-peter.de>
Date: Mon, 20 May 2013 00:25:56 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=31037241e11122203f2ea73b6c1b126a14bfdae2;p=nextcloud-server.git

Merge branch 'master' into files_encryption
---

31037241e11122203f2ea73b6c1b126a14bfdae2