From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 12 Jan 2012 20:44:56 +0000 (+0100)
Subject: Merge branch 'master' into calendar
X-Git-Tag: v3.0~60^2~6^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bcd367873a684388506394880a79db9efb22530;p=nextcloud-server.git

Merge branch 'master' into calendar
---

9bcd367873a684388506394880a79db9efb22530