From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 20 Oct 2014 18:09:27 +0000 (+0200)
Subject: Merge pull request #11673 from owncloud/backport-11593
X-Git-Tag: v7.0.3RC2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d0b3fe2414a553f3b6b1d4bc8dbb937a732a18db;p=nextcloud-server.git

Merge pull request #11673 from owncloud/backport-11593

Backport #11593
---

d0b3fe2414a553f3b6b1d4bc8dbb937a732a18db