From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 10 Jun 2012 16:38:01 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.5.0beta1~74^2~407^2~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ef1b04619daa7b72ca1a8427702bd3552b848e6c;p=nextcloud-server.git

fix merge conflicts
---

ef1b04619daa7b72ca1a8427702bd3552b848e6c