From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 11 Jun 2012 08:59:19 +0000 (+0200)
Subject: Merge branch 'master' into calendar_repeat
X-Git-Tag: v4.5.0beta1~74^2~407^2~46
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4c459782ba4e045509c22a181f18e0c6fc54764;p=nextcloud-server.git

Merge branch 'master' into calendar_repeat
---

f4c459782ba4e045509c22a181f18e0c6fc54764