From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 27 Mar 2012 07:29:16 +0000 (+0200)
Subject: Merge branch 'master' into calendar_sharing
X-Git-Tag: v4.0.0beta~244^2~43
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff75d65d7e82dcd86a7290a46c2da668fb34225f;p=nextcloud-server.git

Merge branch 'master' into calendar_sharing
---

ff75d65d7e82dcd86a7290a46c2da668fb34225f