Merge branch 'PHP-5.5' into PHP-5.6

author Xinchen Hui <laruence@php.net>

Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)

committer Xinchen Hui <laruence@php.net>

Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)
author Xinchen Hui <laruence@php.net>
Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)
committer Xinchen Hui <laruence@php.net>
Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)
diff --cc sapi/fpm/config.m4
Simple merge
diff --cc win32/build/confutils.js
Simple merge
author	Xinchen Hui <laruence@php.net>
	Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)
committer	Xinchen Hui <laruence@php.net>
	Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)
		1	2
sapi/fpm/config.m4	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/confutils.js	patch \|	diff1 \|	diff2 \|	blob \| history