Merge branch 'PHP-5.3' into PHP-5.4

author Anatoliy Belsky <ab@php.net>

Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)

committer Anatoliy Belsky <ab@php.net>

Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)
author Anatoliy Belsky <ab@php.net>
Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)
committer Anatoliy Belsky <ab@php.net>
Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)
diff --cc ext/spl/spl_iterators.c
Simple merge
diff --cc ext/spl/spl_iterators.h
Simple merge
author	Anatoliy Belsky <ab@php.net>
	Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)
committer	Anatoliy Belsky <ab@php.net>
	Wed, 11 Jul 2012 20:29:45 +0000 (22:29 +0200)
		1	2
ext/spl/spl_iterators.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_iterators.h	patch \|	diff1 \|	diff2 \|	blob \| history