Merge "Use Parsoid v3 API; emulate the RESTBase v1 API"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 28 Aug 2015 03:14:27 +0000 (03:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Aug 2015 03:14:27 +0000 (03:14 +0000)

Trivial merge