Merge "Reset all tokens on login"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 May 2016 20:40:57 +0000 (20:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 31 May 2016 20:40:57 +0000 (20:40 +0000)

Trivial merge