Merge branch 'PHP-5.4' into PHP-5.5

author Stanislav Malyshev <stas@php.net>

Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)

committer Stanislav Malyshev <stas@php.net>

Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)
author Stanislav Malyshev <stas@php.net>
Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)
committer Stanislav Malyshev <stas@php.net>
Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)
diff --cc Zend/zend.c
Simple merge
diff --cc main/main.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)
		1	2
Zend/zend.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history