From: Georg Ehrke Date: Sat, 17 Mar 2012 12:59:00 +0000 (+0100) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~57 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eaa1074ccb1c57d700134fae77fd2ecc6d9145dd;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- eaa1074ccb1c57d700134fae77fd2ecc6d9145dd