Merge "Fix login with temporary password with $wgSecureLogin = true"
authorMarkAHershberger <mhershberger@wikimedia.org>
Fri, 22 Nov 2013 16:09:07 +0000 (16:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Nov 2013 16:09:07 +0000 (16:09 +0000)

Trivial merge