From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 17 Jan 2012 14:57:29 +0000 (+0100)
Subject: Merge branch 'master' into calendar
X-Git-Tag: v3.0~38
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e86b3458694f22748de977c702e3c7fe3435e30;p=nextcloud-server.git

Merge branch 'master' into calendar
---

6e86b3458694f22748de977c702e3c7fe3435e30