Merge "registration: Overhaul merging of globals"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 2 Aug 2015 20:29:02 +0000 (20:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 2 Aug 2015 20:29:02 +0000 (20:29 +0000)

Trivial merge