From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 22 Jul 2015 18:15:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8c92889fa18178521c8b140ba3ba43df186e54e5?hp=8c92889fa18178521c8b140ba3ba43df186e54e5

Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
---