Merge "Introduce default expiry time for special:block (bug 32178)"
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 3 Aug 2012 19:09:50 +0000 (19:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Aug 2012 19:09:50 +0000 (19:09 +0000)
1  2 
includes/specials/SpecialBlock.php
languages/messages/MessagesEn.php
maintenance/language/messages.inc

Simple merge
Simple merge
Simple merge