Merge "Hard-deprecate ContentHandler::makeParserOptions()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Jul 2018 20:00:56 +0000 (20:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Jul 2018 20:00:56 +0000 (20:00 +0000)

Trivial merge