Merge "Installer: properly override default $wgLogo value"

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

Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)
diff --cc RELEASE-NOTES-1.23
Simple merge
diff --cc includes/installer/Installer.php
Simple merge
diff --cc includes/installer/WebInstallerPage.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 15 May 2014 13:21:21 +0000 (13:21 +0000)
		1	2
RELEASE-NOTES-1.23	patch \|	diff1 \|	diff2 \|	blob \| history
includes/installer/Installer.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/installer/WebInstallerPage.php	patch \|	diff1 \|	diff2 \|	blob \| history