Merge "Fix some @params documentation in includes/{GlobalFunctions,User.php}"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Apr 2014 09:59:17 +0000 (09:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Apr 2014 09:59:17 +0000 (09:59 +0000)

Trivial merge