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