From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 13 May 2012 13:06:02 +0000 (+0200)
Subject: Merge branch 'master' into calendar_dropimport
X-Git-Tag: v4.5.0beta1~74^2~430^2~19^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62a86748b58d37bf308f3d747389ead816c5c03c;p=nextcloud-server.git

Merge branch 'master' into calendar_dropimport
---

62a86748b58d37bf308f3d747389ead816c5c03c