Merge branch 'PHP-5.5'

author Xinchen Hui <laruence@php.net>

Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)

committer Xinchen Hui <laruence@php.net>

Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)
author Xinchen Hui <laruence@php.net>
Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)
committer Xinchen Hui <laruence@php.net>
Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
diff --cc main/main.c
Simple merge
author	Xinchen Hui <laruence@php.net>
	Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)
committer	Xinchen Hui <laruence@php.net>
	Wed, 14 Aug 2013 03:44:53 +0000 (11:44 +0800)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history