Merge "LocalSettingsGenerator: Remove unused commented-out code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Jul 2014 18:46:33 +0000 (18:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Jul 2014 18:46:33 +0000 (18:46 +0000)

Trivial merge