Merge "Send the profiler output to the 'profileoutput' log group"

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

Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)
diff --cc RELEASE-NOTES-1.23
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 31 Mar 2014 16:16:22 +0000 (16:16 +0000)
		1	2
RELEASE-NOTES-1.23	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history