From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 6 Feb 2013 15:08:53 +0000 (+0000)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v5.0.0alpha1~94^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a3289d3991d9d7cc1b765163c832fa792fb3a146;p=nextcloud-server.git

Merge branch 'master' into files_encryption
---

a3289d3991d9d7cc1b765163c832fa792fb3a146