Merge "resetUserEmail: Allow resetting email without scrambling password"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Mar 2016 22:04:52 +0000 (22:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Mar 2016 22:04:52 +0000 (22:04 +0000)

Trivial merge