From: Georg Ehrke Date: Thu, 22 Mar 2012 19:40:20 +0000 (+0100) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~54 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37963fee28824165d50e8a12c754fb9ee26d89d8;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- 37963fee28824165d50e8a12c754fb9ee26d89d8