Merge "Add $wgRateLimits types ip-all and subnet-all"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 Feb 2016 20:52:05 +0000 (20:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Feb 2016 20:52:05 +0000 (20:52 +0000)
1  2 
includes/user/User.php

Simple merge