From: Georg Ehrke Date: Sun, 13 May 2012 17:12:35 +0000 (+0200) Subject: Merge branch 'master' into calendar_dropimport X-Git-Tag: v4.5.0beta1~74^2~430^2~19^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e9ed3791bd5901b5e05587aec476d882f958029;p=nextcloud-server.git Merge branch 'master' into calendar_dropimport --- 6e9ed3791bd5901b5e05587aec476d882f958029