Merge "Fix phpdoc of User::isIP"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Jun 2016 10:06:17 +0000 (10:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Jun 2016 10:06:17 +0000 (10:06 +0000)

Trivial merge