From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Nov 2014 15:19:06 +0000 (+0100)
Subject: Merge pull request #12291 from owncloud/issue/10991-stable7-backport
X-Git-Tag: v7.0.4RC1~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6a6b645b83384df2512d846315fd51b02af075a0;p=nextcloud-server.git

Merge pull request #12291 from owncloud/issue/10991-stable7-backport

Issue/10991 stable7 backport
---

6a6b645b83384df2512d846315fd51b02af075a0