Merge branch 'PHP-5.6'

author Stanislav Malyshev <stas@php.net>

Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)

committer Stanislav Malyshev <stas@php.net>

Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)
author Stanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)
committer Stanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Mon, 9 Jun 2014 02:02:51 +0000 (19:02 -0700)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history