Merge "Remove the showjumplinks user preference"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)
diff --cc RELEASE-NOTES-1.22
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc languages/messages/MessagesEn.php
Simple merge
diff --cc maintenance/language/messages.inc
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 2 Aug 2013 17:23:59 +0000 (17:23 +0000)
		1	2
RELEASE-NOTES-1.22	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesEn.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/messages.inc	patch \|	diff1 \|	diff2 \|	blob \| history