Merge "Make lines short to pass phpcs in media tests PHP files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 1 Oct 2015 19:58:37 +0000 (19:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 1 Oct 2015 19:58:37 +0000 (19:58 +0000)

Trivial merge