From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 25 Nov 2014 14:45:27 +0000 (+0100)
Subject: Merge pull request #12415 from owncloud/port-12262
X-Git-Tag: v7.0.4RC1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=161e58b1a201fefb710b3b7adf8bc3c7462d8bf5;p=nextcloud-server.git

Merge pull request #12415 from owncloud/port-12262

Backport #12262
---

161e58b1a201fefb710b3b7adf8bc3c7462d8bf5