Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

author daniel <daniel.kinzler@wikimedia.de>

Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)

committer daniel <daniel.kinzler@wikimedia.de>

Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)
author daniel <daniel.kinzler@wikimedia.de>
Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)
committer daniel <daniel.kinzler@wikimedia.de>
Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc languages/Language.php
Simple merge
diff --cc languages/classes/LanguageFi.php
Simple merge
diff --cc languages/messages/MessagesQqq.php
Simple merge
author	daniel <daniel.kinzler@wikimedia.de>
	Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)
committer	daniel <daniel.kinzler@wikimedia.de>
	Thu, 7 Jun 2012 14:36:58 +0000 (16:36 +0200)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/classes/LanguageFi.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesQqq.php	patch \|	diff1 \|	diff2 \|	blob \| history