From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 16 Oct 2013 12:48:55 +0000 (+0200)
Subject: Merge branch 'master' into fixing-5170-master
X-Git-Tag: v6.0.0beta2~101^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8a7b1e5372e7fcc05095c3b9aebe90f33da5760;p=nextcloud-server.git

Merge branch 'master' into fixing-5170-master
---

d8a7b1e5372e7fcc05095c3b9aebe90f33da5760