Merge "Add support for FormData in mw.Api.upload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 13 Jul 2015 17:51:48 +0000 (17:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 13 Jul 2015 17:51:48 +0000 (17:51 +0000)

Trivial merge