From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 22 Jul 2013 09:36:52 +0000 (+0200)
Subject: Merge branch 'master' into disable-anon-upload-master
X-Git-Tag: v6.0.0alpha2~424^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=934f2e94a30e21bbd0c87f347bb05de3437f66db;p=nextcloud-server.git

Merge branch 'master' into disable-anon-upload-master
---

934f2e94a30e21bbd0c87f347bb05de3437f66db