Merge "Update User::getOption() PHPDoc"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 Apr 2018 17:11:16 +0000 (17:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 Apr 2018 17:11:16 +0000 (17:11 +0000)

Trivial merge