From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:54:25 +0000 (+0100)
Subject: fix merge errors
X-Git-Tag: beta-20151122~18
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8f4a3f0e941bc9da5dd17314a4a4fa03d4ca14e?ds=inline;hp=e8f4a3f0e941bc9da5dd17314a4a4fa03d4ca14e

fix merge errors
---