From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 7 Jan 2013 18:07:06 +0000 (+0000)
Subject: Merge "(bug 42064) Make EditFilterMergedContent more generic."
X-Git-Tag: 1.31.0-rc.0~21118
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=372ace006e62b44cb6dfea80fe593cbbbb3f81c1;p=lhc%2Fweb%2Fwiklou.git

Merge "(bug 42064) Make EditFilterMergedContent more generic."
---

372ace006e62b44cb6dfea80fe593cbbbb3f81c1