Merge "break up long line that phpcs whinges about in DefaultSettings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 30 Jan 2015 19:57:50 +0000 (19:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 30 Jan 2015 19:57:50 +0000 (19:57 +0000)

Trivial merge