Merge "Use Config instead of globals"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 8 Aug 2015 20:12:08 +0000 (20:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 8 Aug 2015 20:12:08 +0000 (20:12 +0000)

Trivial merge