Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Jul 2013 21:52:11 +0000 (21:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Jul 2013 21:52:11 +0000 (21:52 +0000)

Trivial merge