Merge "Fix CodeSniffer errors and warnings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Mar 2014 12:53:40 +0000 (12:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Mar 2014 12:53:40 +0000 (12:53 +0000)

Trivial merge