Merge "phpcs: Disable failing sniffs in phpcs.xml"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 26 Sep 2015 13:43:01 +0000 (13:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 26 Sep 2015 13:43:01 +0000 (13:43 +0000)

Trivial merge