Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Feb 2015 05:37:29 +0000 (05:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Feb 2015 05:37:29 +0000 (05:37 +0000)

Trivial merge