Merge "Make 'subnet' feature of $wgRateLimits work with IPv6"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
commit703206f38c63ba51e75a8aa49724f112ab78047d
tree89fd28929b1c79ae6d6b7fddc7f54c10f964c8a5
parent464051acad0b43d8f47e74b2356f6e7c7dd39edf
parent6352be71c603bb9e3059278fbdb731c9ba62b251
Merge "Make 'subnet' feature of $wgRateLimits work with IPv6"
includes/DefaultSettings.php
includes/User.php