Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000 (22:15 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000 (22:15 +0100)

Trivial merge