From: Georg Ehrke Date: Fri, 30 Mar 2012 16:42:09 +0000 (+0200) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~40 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e3203f87ff55ad3173fb72337f2831691e1f0d32;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- e3203f87ff55ad3173fb72337f2831691e1f0d32