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