Merge "Fix testGetCanonicalName PHPUnit test:"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Feb 2015 16:18:13 +0000 (16:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Feb 2015 16:18:13 +0000 (16:18 +0000)

Trivial merge