From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 15 Oct 2016 06:08:13 +0000 (+0000)
Subject: Merge "EditPage: Show EditFilterMergedContent hook errors in an errorbox"
X-Git-Tag: 1.31.0-rc.0~5107
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=b95dc198b9aecde31139a220aaf19d00b7f7a9fe;p=lhc%2Fweb%2Fwiklou.git

Merge "EditPage: Show EditFilterMergedContent hook errors in an errorbox"
---

b95dc198b9aecde31139a220aaf19d00b7f7a9fe