Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

author Xinchen Hui <laruence@gmail.com>

Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)

committer Xinchen Hui <laruence@gmail.com>

Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)
author Xinchen Hui <laruence@gmail.com>
Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)
committer Xinchen Hui <laruence@gmail.com>
Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Xinchen Hui <laruence@gmail.com>
	Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)
committer	Xinchen Hui <laruence@gmail.com>
	Wed, 19 Feb 2014 10:42:22 +0000 (18:42 +0800)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history