From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 28 Jul 2017 11:03:11 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0beta2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d777e56e2d0094b328c57205e6cfc170c9cfc56;p=php

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

5d777e56e2d0094b328c57205e6cfc170c9cfc56
diff --cc NEWS
index 331ddab025,8204cf984d..10d9cd5132
--- a/NEWS
+++ b/NEWS
@@@ -18,9 -14,10 +18,11 @@@ PH
    . Fixed bug #74993 (Wrong reflection on some locale_* functions). (Sara)
  
  - Mbstring:
 +  . Fixed bug #69267 (mb_strtolower fails on titlecase characters). (Nikita)
    . Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding).
      (cmb)
+   . Fixed bug #62934 (mb_convert_kana() does not convert iteration marks).
+     (Nikita)
  
  - MySQLi:
    . Fixed bug #74968 (PHP crashes when calling mysqli_result::fetch_object with