Merge "Make 'subnet' feature of $wgRateLimits work with IPv6"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 29 May 2013 16:55:30 +0000 (16:55 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history