Merge "Fix WikiPage::prepareContentForEdit's default format handling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Dec 2013 20:19:34 +0000 (20:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Dec 2013 20:19:34 +0000 (20:19 +0000)

Trivial merge