From: Florin Peter <github@florin-peter.de>
Date: Fri, 31 May 2013 10:49:46 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption_fs_loaded_fix
X-Git-Tag: v6.0.0alpha2~704^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88d74c33af4718fe78f7b37fa117ecedc9832d65;p=nextcloud-server.git

Merge branch 'master' into files_encryption_fs_loaded_fix
---

88d74c33af4718fe78f7b37fa117ecedc9832d65