Merge "Log a backtrace from the culprit location if headers were already sent"

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

Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 24 Feb 2017 22:41:45 +0000 (22:41 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history