Merge "mediawiki.api.upload: Unbreak finishing stash uploads"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Apr 2016 15:49:17 +0000 (15:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Apr 2016 15:49:17 +0000 (15:49 +0000)

Trivial merge