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

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

77a9e343aae4fc19a1e6fbf71b73e171640ac02a