Merge "Use correct comment format for codingStandardsIgnoreStart"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 1 Oct 2015 19:48:33 +0000 (19:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 1 Oct 2015 19:48:33 +0000 (19:48 +0000)

Trivial merge