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

Merge branch 'master' into calendar_repeat
---

24a1ab8c159170e9837d2aa6887035381e3b10e4