From: Reedy <reedy@wikimedia.org>
Date: Tue, 23 Oct 2012 20:31:33 +0000 (+0000)
Subject: Merge "fix bug 41280, show correct content when displaying edit conflicts"
X-Git-Tag: 1.31.0-rc.0~21893
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=f39292c10b29b3578732018fb4f69a3219e90982;p=lhc%2Fweb%2Fwiklou.git

Merge "fix bug 41280, show correct content when displaying edit conflicts"
---

f39292c10b29b3578732018fb4f69a3219e90982