From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 9 Nov 2016 17:04:37 +0000 (+0000)
Subject: Merge "Extract addition of conflict header explanation"
X-Git-Tag: 1.31.0-rc.0~4912
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=eb4f08984c62f9c8411aad7b46456207b87bf328;p=lhc%2Fweb%2Fwiklou.git

Merge "Extract addition of conflict header explanation"
---

eb4f08984c62f9c8411aad7b46456207b87bf328