From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 25 Apr 2012 08:39:31 +0000 (+0200)
Subject: Merge branch 'sabredav_1.6'
X-Git-Tag: v4.0.0beta~201
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d76552a009ddd394e45b6c4b417e7267f1ae7c3d;p=nextcloud-server.git

Merge branch 'sabredav_1.6'
---

d76552a009ddd394e45b6c4b417e7267f1ae7c3d