Merge branch 'PHP-5.4' into PHP-5.5

author Anatol Belski <ab@php.net>

Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)

committer Anatol Belski <ab@php.net>

Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)
author Anatol Belski <ab@php.net>
Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)
committer Anatol Belski <ab@php.net>
Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)
diff --cc win32/build/Makefile
Simple merge
diff --cc win32/build/confutils.js
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)
committer	Anatol Belski <ab@php.net>
	Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)
		1	2
win32/build/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/confutils.js	patch \|	diff1 \|	diff2 \|	blob \| history