Merge "Sync up with Parsoid parserTests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 24 Sep 2015 15:13:21 +0000 (15:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 24 Sep 2015 15:13:21 +0000 (15:13 +0000)

Trivial merge