Merge "Setup: Merge PreConfigSetup into Setup.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Oct 2017 00:57:06 +0000 (00:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Oct 2017 00:57:06 +0000 (00:57 +0000)

Trivial merge