Merge "Special:Preferences Remove red box in email and changed confirm error to warning"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Dec 2015 20:18:35 +0000 (20:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Dec 2015 20:18:35 +0000 (20:18 +0000)

Trivial merge