From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 3 Feb 2011 13:21:25 +0000 (+0000)
Subject: Followup r81446: and mergehistory too
X-Git-Tag: 1.31.0-rc.0~32234
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=4b8d8353bb33aeead2e618ad581f1dd0cbe0fcee;p=lhc%2Fweb%2Fwiklou.git

Followup r81446: and mergehistory too
---

diff --git a/includes/User.php b/includes/User.php
index cec7cfd802..d89e45e3e7 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -110,6 +110,7 @@ class User {
 		'importupload',
 		'ipblock-exempt',
 		'markbotedits',
+		'mergehistory',
 		'minoredit',
 		'move',
 		'movefile',