Merge branch 'PHP-5.5' into PHP-5.6

author Nikita Popov <nikic@php.net>

Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)

committer Nikita Popov <nikic@php.net>

Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)
author Nikita Popov <nikic@php.net>
Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)
committer Nikita Popov <nikic@php.net>
Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_generators.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>
	Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)
committer	Nikita Popov <nikic@php.net>
	Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_generators.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