Merge "checkTemporaryPassword should call loadPasswords() first"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Jul 2014 01:17:49 +0000 (01:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Jul 2014 01:17:49 +0000 (01:17 +0000)
1  2 
includes/User.php

Simple merge