Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 16 Aug 2013 20:59:32 +0000 (20:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 16 Aug 2013 20:59:32 +0000 (20:59 +0000)

Trivial merge