Merge "(bug 36938) XSS in uselang parameter"

author Catrope <roan.kattouw@gmail.com>

Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)
diff --cc includes/SkinTemplate.php
Simple merge
diff --cc languages/Language.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 13 Jun 2012 17:43:19 +0000 (17:43 +0000)
		1	2
includes/SkinTemplate.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/Language.php	patch \|	diff1 \|	diff2 \|	blob \| history