Merge "fix bug 41280, show correct content when displaying edit conflicts"
authorReedy <reedy@wikimedia.org>
Tue, 23 Oct 2012 20:31:33 +0000 (20:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Oct 2012 20:31:33 +0000 (20:31 +0000)
1  2 
includes/EditPage.php

Simple merge