Merge "Address CodeSniffer errors and warnings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Nov 2013 06:35:56 +0000 (06:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Nov 2013 06:35:56 +0000 (06:35 +0000)

Trivial merge