Merge "user: Minor clean up of User::isLocallyBlockedProxy()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 17 Dec 2016 06:42:10 +0000 (06:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 17 Dec 2016 06:42:10 +0000 (06:42 +0000)

Trivial merge