From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 23 Jun 2016 15:38:46 +0000 (+0000)
Subject: Merge "Count subject and talk page conflict separately"
X-Git-Tag: 1.31.0-rc.0~6534
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=9259dd703b6a0e0f552c2e99b5a9721dbf357526;p=lhc%2Fweb%2Fwiklou.git

Merge "Count subject and talk page conflict separately"
---

9259dd703b6a0e0f552c2e99b5a9721dbf357526