Merge remote-tracking branch 'php/master'

author Anatol Belski <ab@php.net>

Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)

committer Anatol Belski <ab@php.net>

Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)
author Anatol Belski <ab@php.net>
Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)
committer Anatol Belski <ab@php.net>
Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)
diff --cc Zend/zend_builtin_functions.c
Simple merge
diff --cc win32/php_stdint.h
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 21 Aug 2014 07:21:31 +0000 (09:21 +0200)
		1	2
Zend/zend_builtin_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
win32/php_stdint.h	patch \|	diff1 \|	diff2 \|	blob \| history