Merge "Add prebodyhtml template variable"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)
diff --cc includes/SkinTemplate.php
Simple merge
diff --cc skins/Vector.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 13 Mar 2014 22:59:54 +0000 (22:59 +0000)
		1	2
includes/SkinTemplate.php	patch \|	diff1 \|	diff2 \|	blob \| history
skins/Vector.php	patch \|	diff1 \|	diff2 \|	blob \| history