Merge "Add a define guard to NoLocalSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Feb 2013 20:03:53 +0000 (20:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Feb 2013 20:03:53 +0000 (20:03 +0000)

Trivial merge