From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Oct 2015 10:50:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e5caabd104b8e3f5bc416821050c1ce706ec04a0?hp=e5caabd104b8e3f5bc416821050c1ce706ec04a0

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