Merge "Clean up Language::markNoConversion()."

author Nikerabbit <niklas.laxstrom@gmail.com>

Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)
author Nikerabbit <niklas.laxstrom@gmail.com>
Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)
diff --cc languages/Language.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	Nikerabbit <niklas.laxstrom@gmail.com>
	Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Nov 2012 13:01:08 +0000 (13:01 +0000)
		1	2
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history