Merge "Move debug log related settings up in Setup.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 18 Aug 2014 17:45:05 +0000 (17:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 18 Aug 2014 17:45:05 +0000 (17:45 +0000)

Trivial merge