From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 29 Jan 2014 23:56:04 +0000 (+0000)
Subject: Merge "(bug 56184) Allow 3-way merge from arbitrary revisions"
X-Git-Tag: 1.31.0-rc.0~17086
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=112313b10c923f059603ec3137f9771eab15409e;p=lhc%2Fweb%2Fwiklou.git

Merge "(bug 56184) Allow 3-way merge from arbitrary revisions"
---

112313b10c923f059603ec3137f9771eab15409e