From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 26 Apr 2016 20:46:57 +0000 (+0000)
Subject: Merge "Make wikidiff3 the only diff engine"
X-Git-Tag: 1.31.0-rc.0~7168
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=14645c9a5f1e091d401c3a3c94217ff5b4eb7713;p=lhc%2Fweb%2Fwiklou.git

Merge "Make wikidiff3 the only diff engine"
---

14645c9a5f1e091d401c3a3c94217ff5b4eb7713