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

Merge branch 'master' into calendar
---

db490fbc8f6114e3aa96d3a417eb25766dc1cafb