From: Legoktm <legoktm.wikipedia@gmail.com>
Date: Sat, 24 Jan 2015 01:34:13 +0000 (+0000)
Subject: Merge "Output number of conflicts"
X-Git-Tag: 1.31.0-rc.0~12611
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=ba694fa8a5671fd3d0380a28b2836ef3fe74f645;p=lhc%2Fweb%2Fwiklou.git

Merge "Output number of conflicts"
---

ba694fa8a5671fd3d0380a28b2836ef3fe74f645