From: Georg Ehrke <ownclouddev@georgswebsite.de>
Date: Sat, 14 Jan 2012 13:25:49 +0000 (+0100)
Subject: Merge branch 'calendar'
X-Git-Tag: v3.0~59^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d1c414ffbcd0b9a17227067c2fbbfc96753d364;p=nextcloud-server.git

Merge branch 'calendar'
---

4d1c414ffbcd0b9a17227067c2fbbfc96753d364