Merge "Deprecate OutputPage::parserOptions() as a setter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Nov 2017 20:45:47 +0000 (20:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Nov 2017 20:45:47 +0000 (20:45 +0000)

Trivial merge