From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 25 May 2012 08:30:00 +0000 (+0200)
Subject: Merge branch 'master' into calendar_repeat
X-Git-Tag: v4.5.0beta1~74^2~407^2~70
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc9accd26e3d0257444947cd74c478db1fa91901;p=nextcloud-server.git

Merge branch 'master' into calendar_repeat
---

bc9accd26e3d0257444947cd74c478db1fa91901