Merge "Do correct average year length arithmetic."

author IAlex <ialex.wiki@gmail.com>

Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)
author IAlex <ialex.wiki@gmail.com>
Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)
diff --cc languages/Language.php
Simple merge
diff --cc tests/phpunit/languages/LanguageTest.php
Simple merge
author	IAlex <ialex.wiki@gmail.com>
	Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 29 Dec 2012 19:18:05 +0000 (19:18 +0000)
		1	2
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/languages/LanguageTest.php	patch \|	diff1 \|	diff2 \|	blob \| history