Merge branch 'PHP-5.5' into PHP-5.6

author Remi Collet <remi@php.net>

Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)

committer Remi Collet <remi@php.net>

Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)
author Remi Collet <remi@php.net>
Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)
committer Remi Collet <remi@php.net>
Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)
diff --cc Zend/zend_builtin_functions.c
Simple merge
diff --cc ext/reflection/php_reflection.c
Simple merge
author	Remi Collet <remi@php.net>
	Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)
committer	Remi Collet <remi@php.net>
	Tue, 10 Dec 2013 15:10:20 +0000 (16:10 +0100)
		1	2
Zend/zend_builtin_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	patch \|	diff1 \|	diff2 \|	blob \| history