From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 13 Jun 2013 10:53:29 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption_upgrade_fix
X-Git-Tag: v6.0.0alpha2~642^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc2862fcb947ac65c80b5d49ea8f2c2271eb8021;p=nextcloud-server.git

Merge branch 'master' into files_encryption_upgrade_fix
---

bc2862fcb947ac65c80b5d49ea8f2c2271eb8021