Merge "Avoid unstubbing $wgUser before the end of Setup.php in User::getBlockedStatus()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Feb 2016 16:42:07 +0000 (16:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Feb 2016 16:42:07 +0000 (16:42 +0000)

Trivial merge