Merge branch 'PHP-5.5'

author Anatol Belski <ab@php.net>

Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)

committer Anatol Belski <ab@php.net>

Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)
author Anatol Belski <ab@php.net>
Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)
committer Anatol Belski <ab@php.net>
Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)
diff --cc Zend/zend_vm_execute.h
Simple merge
diff --cc Zend/zend_vm_gen.php
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)
committer	Anatol Belski <ab@php.net>
	Fri, 23 Aug 2013 15:45:45 +0000 (17:45 +0200)
		1	2
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_gen.php	patch \|	diff1 \|	diff2 \|	blob \| history