Merge "Ignore CodeSniffer checks on HTML template files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 May 2014 20:26:10 +0000 (20:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 May 2014 20:26:10 +0000 (20:26 +0000)

Trivial merge