From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 22 Jul 2017 09:16:48 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta2~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76ce87442268f850512fb3b85ae3359102371716;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

76ce87442268f850512fb3b85ae3359102371716
diff --cc NEWS
index 95890db4ca,b9c7a9a202..326a66e659
--- a/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)