Merge "Minor documentation fix for ContentHandler::makeParserOptions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 1 Feb 2014 16:24:14 +0000 (16:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 1 Feb 2014 16:24:14 +0000 (16:24 +0000)

Trivial merge