From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 1 Nov 2015 08:07:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/streaming' into beta
X-Git-Tag: beta-20151122~55
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/465ff1b7b8b04132f58fdea80cdf12ce9a2e01fd?hp=465ff1b7b8b04132f58fdea80cdf12ce9a2e01fd

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