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