From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 28 Feb 2017 18:35:53 +0000 (+0000)
Subject: Merge "Make EditPage::incrementConflictStats protected"
X-Git-Tag: 1.31.0-rc.0~3952
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=dcfec00f3b1224081e5192d5cf6d426a3c66029c;p=lhc%2Fweb%2Fwiklou.git

Merge "Make EditPage::incrementConflictStats protected"
---

dcfec00f3b1224081e5192d5cf6d426a3c66029c