From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 18 Oct 2015 08:08:46 +0000 (+0200)
Subject: Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7fe9c02bffe53c3a8a40ee68e1a5c4c713c9d899?ds=inline;hp=7fe9c02bffe53c3a8a40ee68e1a5c4c713c9d899

Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
---