From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 01:18:02 +0000 (+0000)
Subject: Fix merge conflicts
X-Git-Tag: v3.0~64^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cbb2db8622dbcff2314204bc548ebdd3005bd0fc;p=nextcloud-server.git

Fix merge conflicts
---

cbb2db8622dbcff2314204bc548ebdd3005bd0fc