From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 2 Aug 2015 20:29:02 +0000 (+0000)
Subject: Merge "registration: Overhaul merging of globals"
X-Git-Tag: 1.31.0-rc.0~10548
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=b42dee542f1267506c6313ba06d9d8c8705a6ec5;p=lhc%2Fweb%2Fwiklou.git

Merge "registration: Overhaul merging of globals"
---

b42dee542f1267506c6313ba06d9d8c8705a6ec5