Merge "Ditch support for original wikidiff"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Mar 2016 21:01:58 +0000 (21:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Mar 2016 21:01:58 +0000 (21:01 +0000)

Trivial merge