From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 17 Apr 2015 15:36:07 +0000 (+0200)
Subject: Merge pull request #15699 from owncloud/fix-15696-master
X-Git-Tag: v8.1.0alpha2~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f2fe9fffd934a9af2c9f9127832dd7b700633924;p=nextcloud-server.git

Merge pull request #15699 from owncloud/fix-15696-master

Fix 15696 master
---

f2fe9fffd934a9af2c9f9127832dd7b700633924