From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 23 May 2013 09:11:57 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb79169cf54bfc9d7c79422ebf118717acf9d980;p=nextcloud-server.git

Merge branch 'master' into files_encryption
---

cb79169cf54bfc9d7c79422ebf118717acf9d980