Merge "Allow extensions to set a custom error message in the BlockIp hook"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 20 Jan 2014 15:22:03 +0000 (15:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 20 Jan 2014 15:22:03 +0000 (15:22 +0000)
1  2 
includes/specials/SpecialBlock.php

Simple merge