From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 17:47:48 +0000 (+0200)
Subject: Merge branch 'master' into calendar_repeat
X-Git-Tag: v4.5.0beta1~74^2~407^2~65
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f1a48aec73d70e941c7b20ee47b590d2e8e7e13a;p=nextcloud-server.git

Merge branch 'master' into calendar_repeat
---

f1a48aec73d70e941c7b20ee47b590d2e8e7e13a