Merge branch 'PHP-5.5' into PHP-5.6

author Xinchen Hui <laruence@php.net>

Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)

committer Xinchen Hui <laruence@php.net>

Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)
author Xinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)
committer Xinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Xinchen Hui <laruence@php.net>
	Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)
committer	Xinchen Hui <laruence@php.net>
	Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history