Merge "Avoid extra parsing in prepareContentForEdit()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Nov 2013 23:32:57 +0000 (23:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Nov 2013 23:32:57 +0000 (23:32 +0000)

Trivial merge