Merge "Avoid some unused parameter IDEA errors in User.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Sep 2015 22:19:11 +0000 (22:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Sep 2015 22:19:11 +0000 (22:19 +0000)

Trivial merge