Merge "Fix file/class name mismatch from e2adcc89bbe"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 18 Sep 2016 02:09:11 +0000 (02:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 18 Sep 2016 02:09:11 +0000 (02:09 +0000)

Trivial merge