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