From: Robin Appelman <robin@icewind.nl>
Date: Tue, 24 Mar 2015 16:54:11 +0000 (+0100)
Subject: Merge pull request #15158 from owncloud/fix-failing-master
X-Git-Tag: v8.1.0alpha1~193
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1bd141b65511983326f0076b676b14e1528ddd65;p=nextcloud-server.git

Merge pull request #15158 from owncloud/fix-failing-master

Fix failing master unit tests
---

1bd141b65511983326f0076b676b14e1528ddd65