Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikita.ppv@gmail.com>

Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)
diff --cc Zend/zend_builtin_functions.c
Simple merge
diff --cc ext/zlib/zlib.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 25 Jun 2017 13:30:29 +0000 (15:30 +0200)
		1	2
Zend/zend_builtin_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/zlib/zlib.c	patch \|	diff1 \|	diff2 \|	blob \| history