From: Anomie <bjorsch@wikimedia.org>
Date: Fri, 16 Nov 2012 16:56:34 +0000 (+0000)
Subject: Merge "Regression test for detecting edit conflicts."
X-Git-Tag: 1.31.0-rc.0~21617
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=f950401ed28fea4b6f2f1a874f5ac469f8837896;p=lhc%2Fweb%2Fwiklou.git

Merge "Regression test for detecting edit conflicts."
---

f950401ed28fea4b6f2f1a874f5ac469f8837896