From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 1 Nov 2015 07:29:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into streaming
X-Git-Tag: beta-20151122~53^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e2d0a1cfb477c201b935d0760546ef97382de5f4

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

e2d0a1cfb477c201b935d0760546ef97382de5f4