Merge "Don't allow some E_NOTICE messages to end up in the LocalSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 23 Jun 2014 20:53:28 +0000 (20:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Jun 2014 20:53:28 +0000 (20:53 +0000)

Trivial merge