Merge "mediawiki.api.parse: Specify wikitext as the content model"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Jun 2013 06:12:44 +0000 (06:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Jun 2013 06:12:44 +0000 (06:12 +0000)

Trivial merge