From: Georg Ehrke Date: Sun, 15 Apr 2012 12:28:31 +0000 (+0200) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~7 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0