From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:33:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
X-Git-Tag: beta-20151122~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b1df33a8066fe756f09aab140775f21163489a5e?hp=b1df33a8066fe756f09aab140775f21163489a5e

Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
---