Merge "Reduced some master queries via Revision::READ_NORMAL."

author Catrope <roan.kattouw@gmail.com>

Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)
author Catrope <roan.kattouw@gmail.com>
Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)
diff --cc includes/Skin.php
Simple merge
diff --cc includes/parser/CoreParserFunctions.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 28 Aug 2012 23:53:26 +0000 (23:53 +0000)
		1	2
includes/Skin.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/CoreParserFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history