From: Georg Ehrke Date: Wed, 21 Mar 2012 08:43:29 +0000 (+0100) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~55 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=61166c1002a7a44351e27b17d651afd3afc2f3b5;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- 61166c1002a7a44351e27b17d651afd3afc2f3b5