From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 29 Mar 2012 21:20:03 +0000 (+0200)
Subject: Merge branch 'master' into sabredav_1.6
X-Git-Tag: v4.0.0beta~201^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=90286353e24738006128b1801c55483d2103e6ae;p=nextcloud-server.git

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

90286353e24738006128b1801c55483d2103e6ae