Merge "Avoid DB_MASTER use on password checks and defer password upgrades"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 26 Sep 2016 15:30:54 +0000 (15:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 26 Sep 2016 15:30:54 +0000 (15:30 +0000)

Trivial merge