Merge branch 'PHP-5.5' into PHP-5.6

author Xinchen Hui <laruence@php.net>

Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)

committer Xinchen Hui <laruence@php.net>

Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)
author Xinchen Hui <laruence@php.net>
Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)
committer Xinchen Hui <laruence@php.net>
Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)
diff --cc ext/spl/spl_directory.c
Simple merge
diff --cc ext/spl/spl_iterators.c
Simple merge
author	Xinchen Hui <laruence@php.net>
	Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)
committer	Xinchen Hui <laruence@php.net>
	Sun, 1 Jun 2014 11:42:20 +0000 (19:42 +0800)
		1	2
ext/spl/spl_directory.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_iterators.c	patch \|	diff1 \|	diff2 \|	blob \| history