From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 15 Jan 2012 17:33:46 +0000 (+0100)
Subject: Merge branch 'master' into calendar
X-Git-Tag: v3.0~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c81beab96d3e5f83f395532fb9cf0e2671bcb72c;p=nextcloud-server.git

Merge branch 'master' into calendar
---

c81beab96d3e5f83f395532fb9cf0e2671bcb72c