From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 31 May 2012 10:20:56 +0000 (+0200)
Subject: Merge branch 'master' into calendar_repeat
X-Git-Tag: v4.5.0beta1~74^2~407^2~64
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c5cc70c0e3878f5e9903348310606b296de0993d;p=nextcloud-server.git

Merge branch 'master' into calendar_repeat
---

c5cc70c0e3878f5e9903348310606b296de0993d