From: Georg Ehrke Date: Wed, 18 Apr 2012 09:51:59 +0000 (+0200) Subject: Merge branch 'master' into calendar_sharing X-Git-Tag: v4.0.0beta~244^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cf492a96496920c42f3ad384f5ca0886a5323c72;p=nextcloud-server.git Merge branch 'master' into calendar_sharing --- cf492a96496920c42f3ad384f5ca0886a5323c72