From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 19 May 2012 16:58:24 +0000 (+0200)
Subject: Merge branch 'calendar_dropimport'
X-Git-Tag: v4.5.0beta1~74^2~430^2~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad66bb9c84ff7186526d5fdf60453c0deb1867d6;p=nextcloud-server.git

Merge branch 'calendar_dropimport'
---

ad66bb9c84ff7186526d5fdf60453c0deb1867d6