From: Georg Ehrke Date: Thu, 29 Mar 2012 21:19:31 +0000 (+0200) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~41 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d15959d5732a7fd4972849c4d81f7178f8d6684b;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- d15959d5732a7fd4972849c4d81f7178f8d6684b