From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 4 Oct 2013 08:09:00 +0000 (-0700)
Subject: Merge pull request #5096 from owncloud/backport-4960-stable5
X-Git-Tag: v5.0.13~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1bc7ae869aa4887b525b5a8de5d6e7ada99163c8;p=nextcloud-server.git

Merge pull request #5096 from owncloud/backport-4960-stable5

Backport of #4960 to stable5
---

1bc7ae869aa4887b525b5a8de5d6e7ada99163c8