Merge "Avoid CAS update errors on password reset"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 28 Dec 2015 23:38:36 +0000 (23:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Dec 2015 23:38:36 +0000 (23:38 +0000)

Trivial merge