Merge "Check for global blocks"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Apr 2016 21:45:20 +0000 (21:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Apr 2016 21:45:20 +0000 (21:45 +0000)
1  2 
includes/user/User.php

Simple merge