Merge "Restore Userlogin error/warning URL parameter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 May 2016 22:12:27 +0000 (22:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 May 2016 22:12:27 +0000 (22:12 +0000)

Trivial merge