Merge "Remove proxyunbannable from core"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Jan 2016 18:34:42 +0000 (18:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Jan 2016 18:34:42 +0000 (18:34 +0000)
1  2 
includes/user/User.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge