Merge branch 'PHP-5.6'

author Xinchen Hui <laruence@php.net>

Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)

committer Xinchen Hui <laruence@php.net>

Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)
author Xinchen Hui <laruence@php.net>
Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)
committer Xinchen Hui <laruence@php.net>
Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)
diff --cc main/output.c
Simple merge
diff --cc main/php_output.h
Simple merge
author	Xinchen Hui <laruence@php.net>
	Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)
committer	Xinchen Hui <laruence@php.net>
	Thu, 30 Oct 2014 03:42:40 +0000 (11:42 +0800)
		1	2
main/output.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_output.h	patch \|	diff1 \|	diff2 \|	blob \| history