Merge branch 'PHP-5.5'

author Nikita Popov <nikic@php.net>

Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)

committer Nikita Popov <nikic@php.net>

Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)
author Nikita Popov <nikic@php.net>
Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)
committer Nikita Popov <nikic@php.net>
Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Nikita Popov <nikic@php.net>
	Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)
committer	Nikita Popov <nikic@php.net>
	Fri, 4 Oct 2013 11:15:45 +0000 (13:15 +0200)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history