Merge "mediawiki.api.upload: Fix jsduck indentation error"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Sep 2015 00:14:23 +0000 (00:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Sep 2015 00:14:23 +0000 (00:14 +0000)

Trivial merge