From: Georg Ehrke <developer@georgehrke.com>
Date: Fri, 30 Aug 2013 16:11:18 +0000 (+0200)
Subject: Merge master into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ef40277b21688112c48d40a9c80a519c3e7460c;p=nextcloud-server.git

Merge master into oc_preview
---

8ef40277b21688112c48d40a9c80a519c3e7460c