From: Morris Jobke <morris.jobke@gmail.com>
Date: Sun, 22 Sep 2013 15:40:20 +0000 (-0700)
Subject: Merge pull request #4929 from owncloud/fixing-4416-master
X-Git-Tag: v6.0.0alpha2~153
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37bd489d2b832eef48ec5ff5dc50c24b8c13a215;p=nextcloud-server.git

Merge pull request #4929 from owncloud/fixing-4416-master

Fixing 4416 master
---

37bd489d2b832eef48ec5ff5dc50c24b8c13a215