Merge branch 'PHP-7.1' into PHP-7.2

author Bob Weinand <bobwei9@hotmail.com>

Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)

committer Bob Weinand <bobwei9@hotmail.com>

Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)
author Bob Weinand <bobwei9@hotmail.com>
Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)
committer Bob Weinand <bobwei9@hotmail.com>
Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)
diff --cc NEWS

index 95890db4ca2a939f212e2a2dd6dee85f158ea528,b9c7a9a2025f11b917dcfe658c45180b78c1e2d8..326a66e6597657ba8d08872357d8e91be8761d0d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,6 -1,6 +1,6 @@@
   PHP                                                                        NEWS
   |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- ?? ??? ????, PHP 7.2.0beta2
- -?? ??? ????, PHP 7.1.9
++?? ??? 2017, PHP 7.2.0beta2
   
   - Core:
     . Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
diff --cc Zend/zend_generators.c
Simple merge
author	Bob Weinand <bobwei9@hotmail.com>
	Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)
committer	Bob Weinand <bobwei9@hotmail.com>
	Sat, 22 Jul 2017 09:16:48 +0000 (11:16 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_generators.c	patch \|	diff1 \|	diff2 \|	blob \| history