Merge "UploadBaseTest: Use setMwGlobals() instead of juggling globals"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Oct 2014 06:46:11 +0000 (06:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Oct 2014 06:46:11 +0000 (06:46 +0000)

Trivial merge