Merge branch 'master' of https://git.php.net/push/php-src

author Kalle Sommer Nielsen <kalle@php.net>

Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)

committer Kalle Sommer Nielsen <kalle@php.net>

Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)
author Kalle Sommer Nielsen <kalle@php.net>
Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)
committer Kalle Sommer Nielsen <kalle@php.net>
Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Kalle Sommer Nielsen <kalle@php.net>
	Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)
committer	Kalle Sommer Nielsen <kalle@php.net>
	Wed, 18 Dec 2013 06:27:14 +0000 (07:27 +0100)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history