Merge "Revert "Apply IP blocks to X-Forwarded-For header""
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 29 Mar 2013 19:57:34 +0000 (19:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Mar 2013 19:57:35 +0000 (19:57 +0000)
commitfb096ec3395cdb08723b9dbdcb8ecebe1b950396
treec523cd38efee6268d5bf4d9ab4172ae89f989c51
parentf158adb7042513e72140cba5d5d107bc7870d082
parent4ba66e41b5b52ac17a3bcdc58937b2739743ccc7
Merge "Revert "Apply IP blocks to X-Forwarded-For header""
RELEASE-NOTES-1.21
includes/DefaultSettings.php
includes/User.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc