Merge branch 'PHP-5.5' into PHP-5.6

author Xinchen Hui <laruence@php.net>

Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)

committer Xinchen Hui <laruence@php.net>

Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)
author Xinchen Hui <laruence@php.net>
Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)
committer Xinchen Hui <laruence@php.net>
Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)
diff --cc ext/spl/spl_observer.c
Simple merge
diff --cc ext/spl/tests/bug53071.phpt
Simple merge
author	Xinchen Hui <laruence@php.net>
	Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)
committer	Xinchen Hui <laruence@php.net>
	Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)
		1	2
ext/spl/spl_observer.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/tests/bug53071.phpt	patch \|	diff1 \|	diff2 \|	blob \| history