From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 19:40:05 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.5.0beta1~74^2~407^2~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d29bee859769fd5db746e3f7a340d6c12c628dd;p=nextcloud-server.git

fix merge conflicts
---

7d29bee859769fd5db746e3f7a340d6c12c628dd