Merge "WikiPage::prepareTextForEdit() was removed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 12 Dec 2016 14:45:52 +0000 (14:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 12 Dec 2016 14:45:53 +0000 (14:45 +0000)

Trivial merge