Merge "OutputPage: Don't get a ParserOptions for $wgUser before the end of Setup...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 9 Feb 2016 00:51:44 +0000 (00:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 9 Feb 2016 00:51:44 +0000 (00:51 +0000)

Trivial merge