From: Georg Ehrke Date: Wed, 6 Jun 2012 08:12:11 +0000 (+0200) Subject: Merge branch 'master' into calendar_repeat X-Git-Tag: v4.5.0beta1~74^2~407^2~58 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c;p=nextcloud-server.git Merge branch 'master' into calendar_repeat --- 2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c