Merge "Remove unneeded spaces inside html in NoLocalSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Sep 2014 19:33:17 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Sep 2014 19:33:17 +0000 (19:33 +0000)

Trivial merge