From: Kondou <kondou@ts.unde.re>
Date: Mon, 29 Jul 2013 13:59:44 +0000 (-0700)
Subject: Merge pull request #4222 from owncloud/backport-3459-stable5
X-Git-Tag: v5.0.10~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb3c3770d8684056e9942dba2a4907e9ecd45701;p=nextcloud-server.git

Merge pull request #4222 from owncloud/backport-3459-stable5

Backport 3459 stable5
---

cb3c3770d8684056e9942dba2a4907e9ecd45701