Merge branch 'PHP-7.1'

author Nikita Popov <nikic@php.net>

Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)

committer Nikita Popov <nikic@php.net>

Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)
author Nikita Popov <nikic@php.net>
Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)
committer Nikita Popov <nikic@php.net>
Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)
diff --cc Zend/zend_types.h
Simple merge
diff --cc ext/standard/var_unserializer.c
Simple merge
diff --cc ext/standard/var_unserializer.re
Simple merge
author	Nikita Popov <nikic@php.net>
	Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)
committer	Nikita Popov <nikic@php.net>
	Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)
		1	2
Zend/zend_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/var_unserializer.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/var_unserializer.re	patch \|	diff1 \|	diff2 \|	blob \| history