Merge "Fix login API for users with @ in their usernames"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 14 Sep 2016 15:33:07 +0000 (15:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 14 Sep 2016 15:33:07 +0000 (15:33 +0000)

Trivial merge