From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 May 2018 23:54:23 +0000 (+0000)
Subject: Merge "registration: Improve duplicate config setting exception" into REL1_31
X-Git-Tag: 1.31.0-rc.1~7
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=1a66f01995a190e2782dec9dc578dcdd16a32e02;hp=-c

Merge "registration: Improve duplicate config setting exception" into REL1_31
---

1a66f01995a190e2782dec9dc578dcdd16a32e02