Merge "Make lines short to pass phpcs in six files under includes/"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 26 Sep 2015 19:04:13 +0000 (19:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 26 Sep 2015 19:04:13 +0000 (19:04 +0000)

Trivial merge