Merge "Make PHPCS pass on JsonContentTest"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Dec 2014 19:47:09 +0000 (19:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Dec 2014 19:47:09 +0000 (19:47 +0000)

Trivial merge