Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Jul 2015 18:15:14 +0000 (20:15 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Jul 2015 18:15:14 +0000 (20:15 +0200)

No differences found