Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 Jan 2014 23:38:11 +0000 (23:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 Jan 2014 23:38:11 +0000 (23:38 +0000)

Trivial merge