Merge branch 'PHP-7.1'

author Anatol Belski <ab@php.net>

Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)

committer Anatol Belski <ab@php.net>

Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)
author Anatol Belski <ab@php.net>
Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)
committer Anatol Belski <ab@php.net>
Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)
diff --cc Zend/zend_virtual_cwd.c
Simple merge
diff --cc win32/build/confutils.js
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)
		1	2
Zend/zend_virtual_cwd.c	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/confutils.js	patch \|	diff1 \|	diff2 \|	blob \| history