From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:44:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
X-Git-Tag: beta-20151122~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/75b88e18b40bdb8abb6eec74027720209bee9349?hp=75b88e18b40bdb8abb6eec74027720209bee9349

Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
---