From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 14 Jan 2012 23:08:36 +0000 (+0100)
Subject: Merge branch 'calendar'
X-Git-Tag: v3.0~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d347fe0c53fca52bc1d2b3d171d86494dad7835d;p=nextcloud-server.git

Merge branch 'calendar'
---

d347fe0c53fca52bc1d2b3d171d86494dad7835d