Merge "Apply IP blocks to X-Forwarded-For header"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 29 Mar 2013 18:42:50 +0000 (18:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Mar 2013 18:42:50 +0000 (18:42 +0000)
commit8b3108fe7787c7a3e70bae32fe389958d1ca6106
treeed1d2c94176fc42b0a2308d9ccab5706b56fe542
parent44c7d1ed6802d8f34acea06ded5d9ea1b186b0f6
parenta5d70e3ae6b43743b63f8d4e8efdfd6e26e35d40
Merge "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