Merge "Make lines short to pass phpcs in WikitextContentTest.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 3 Oct 2015 16:39:50 +0000 (16:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 3 Oct 2015 16:39:50 +0000 (16:39 +0000)

Trivial merge