Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2

author Dmitry Stogov <dmitry@zend.com>

Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)

committer Dmitry Stogov <dmitry@zend.com>

Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)
author Dmitry Stogov <dmitry@zend.com>
Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)
committer Dmitry Stogov <dmitry@zend.com>
Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Wed, 19 Feb 2014 10:36:05 +0000 (14:36 +0400)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history