Merge "mw.api.upload: Suppress default API call timeout"
authorMarkTraceur <mholmquist@wikimedia.org>
Wed, 21 Sep 2016 18:48:56 +0000 (18:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Sep 2016 18:48:56 +0000 (18:48 +0000)

Trivial merge