Merge "Fix PHP CodeSniffer warnings and errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Oct 2013 17:58:50 +0000 (17:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Oct 2013 17:58:50 +0000 (17:58 +0000)

Trivial merge