Merge "Pass phpcs-strict on maintenance/ (7/8)"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Apr 2014 15:37:12 +0000 (15:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Apr 2014 15:37:12 +0000 (15:37 +0000)

Trivial merge