From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 11 Apr 2012 00:10:07 +0000 (-0400)
Subject: Merge branch 'master' into calendar_sharing
X-Git-Tag: v4.0.0beta~244^2~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac2d14101cc15d62d238c1299eb02e341c2e0c07;p=nextcloud-server.git

Merge branch 'master' into calendar_sharing
---

ac2d14101cc15d62d238c1299eb02e341c2e0c07