From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Feb 2012 13:26:52 +0000 (+0100)
Subject: Merge branch 'master' into enc
X-Git-Tag: v4.0.0beta~440^2~60
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a9ded981b130b3917e6665dc23be33d5a6ae2e0;p=nextcloud-server.git

Merge branch 'master' into enc
---

1a9ded981b130b3917e6665dc23be33d5a6ae2e0