Merge "SECURITY: Make $wgBlockDisablesLogin also restrict logged in permissions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Aug 2016 02:28:32 +0000 (02:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Aug 2016 02:28:32 +0000 (02:28 +0000)

Trivial merge