From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 11 Apr 2012 02:44:13 +0000 (-0400)
Subject: Merge branch 'master' into sabredav_1.6
X-Git-Tag: v4.0.0beta~201^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=613e15035e3f02a212c9f3ec11ae98fc3ef682c8;p=nextcloud-server.git

Merge branch 'master' into sabredav_1.6
---

613e15035e3f02a212c9f3ec11ae98fc3ef682c8