Merge "(bug 18834) Add an edit count to rollback link"

author Catrope <roan.kattouw@gmail.com>

Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)
diff --cc languages/messages/MessagesEn.php
Simple merge
diff --cc languages/messages/MessagesQqq.php
Simple merge
diff --cc maintenance/language/messages.inc
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 1 Aug 2012 00:44:29 +0000 (00:44 +0000)
		1	2
languages/messages/MessagesEn.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesQqq.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/messages.inc	patch \|	diff1 \|	diff2 \|	blob \| history