Merge "Pass phpcs-strict on includes/upload"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 10 May 2014 08:38:18 +0000 (08:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 10 May 2014 08:38:18 +0000 (08:38 +0000)

Trivial merge