Merge "Fix undefined variable in User::setNewpassword"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 20 Oct 2015 18:47:06 +0000 (18:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 20 Oct 2015 18:47:06 +0000 (18:47 +0000)

Trivial merge