Merge "UserTest: Cover User::isIP and User::isValidUserName better"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Jul 2014 17:24:26 +0000 (17:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Jul 2014 17:24:26 +0000 (17:24 +0000)

Trivial merge