From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 3 Sep 2016 18:01:06 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1359^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85824eda366a7d56aacdeb7d0b334a21ff14c9e3;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

85824eda366a7d56aacdeb7d0b334a21ff14c9e3
diff --cc NEWS
index f01ae1595c,c26aa34fe3..4a63f0b8f3
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,14 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2016 PHP 7.0.12
 +?? ??? 2016, PHP 7.1.0RC2
  
 -- GD:
++-GD:
+   . Fixed bug #67325 (imagetruecolortopalette: white is duplicated in palette).
+     (cmb)
+ 
 -- mbstring:
 -  . Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
 -
  - Opcache:
    . Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp()
      function). (Laruence)