Merge "Don't display multiple language links to the same language"

author MaxSem <maxsem.wiki@gmail.com>

Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)
author MaxSem <maxsem.wiki@gmail.com>
Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	MaxSem <maxsem.wiki@gmail.com>
	Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 5 Oct 2012 19:15:44 +0000 (19:15 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Parser.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history