Merge branch 'PHP-5.5' into PHP-5.6

author Xinchen Hui <laruence@php.net>

Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)

committer Xinchen Hui <laruence@php.net>

Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)
author Xinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)
committer Xinchen Hui <laruence@php.net>
Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_opcode.c
Simple merge
author	Xinchen Hui <laruence@php.net>
	Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)
committer	Xinchen Hui <laruence@php.net>
	Thu, 5 Mar 2015 10:40:06 +0000 (18:40 +0800)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_opcode.c	patch \|	diff1 \|	diff2 \|	blob \| history