Merge "Make it show email as required if you choose to email a random password."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Jul 2013 21:35:51 +0000 (21:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Jul 2013 21:35:51 +0000 (21:35 +0000)
1  2 
resources/Resources.php

Simple merge