Merge "Don't apply IP blocks to users with "ipblock-exempt" rights when creating...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 13 Jan 2013 20:31:47 +0000 (20:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 13 Jan 2013 20:31:47 +0000 (20:31 +0000)
1  2 
includes/User.php

Simple merge