Merge "Clean up mediawiki.legacy.upload a bit more"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 30 Aug 2014 20:17:52 +0000 (20:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 30 Aug 2014 20:17:52 +0000 (20:17 +0000)

Trivial merge