From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 12 Apr 2018 17:11:16 +0000 (+0000)
Subject: Merge "Update User::getOption() PHPDoc"
X-Git-Tag: 1.31.0-rc.0~102
X-Git-Url: http://git.cyclocoop.org/%27http:/code.google.com/p/ie7-js/%27%20.%20htmlspecialchars%28%20%24mainPageObj-%3EgetLocalURL%28%29%20%29%20.%20%27?a=commitdiff_plain;h=2fe97b078ab83af56bf00efe288434af389f03a7;p=lhc%2Fweb%2Fwiklou.git

Merge "Update User::getOption() PHPDoc"
---

2fe97b078ab83af56bf00efe288434af389f03a7