From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 11 Aug 2016 17:37:17 +0000 (+0200)
Subject: Merge branch 'master' into implement_712
X-Git-Tag: v11.0RC2~824^2~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8261ccce1be32c1467874d537240585c0d841600;p=nextcloud-server.git

Merge branch 'master' into implement_712
---

8261ccce1be32c1467874d537240585c0d841600