From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 29 Aug 2016 23:18:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec8bbba9c66072cccbc9074ea3de90499c525a13;p=php

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

ec8bbba9c66072cccbc9074ea3de90499c525a13
diff --cc NEWS
index f62cd734ff,4eb5a7d531..e68a2e8244
--- a/NEWS
+++ b/NEWS
@@@ -24,6 -34,12 +24,9 @@@ PH
      images). (cmb)
    . Fixed bug #68716 (possible resource leaks in _php_image_convert()). (cmb)
  
+ - iconv:
+   . Fixed bug #72320 (iconv_substr returns false for empty strings). (cmb)
+ 
 -- IMAP:
 -  . Fixed bug #72852 (imap_mail null dereference). (Anatol)
 -
  - Intl:
    . Fixed bug #65732 (grapheme_*() is not Unicode compliant on CR LF
      sequence). (cmb)