From: Sam Tuke <samtuke@owncloud.com>
Date: Sat, 5 Jan 2013 17:22:01 +0000 (+0000)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v5.0.0alpha1~208^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=69e86c0213317bbd58fcc0a5dfa29ef593d93541;p=nextcloud-server.git

Merge branch 'master' into files_encryption
---

69e86c0213317bbd58fcc0a5dfa29ef593d93541