Merge branch 'pull-request/1094'

* pull-request/1094:
  added php_mb_check_code_point for mb_substitute_character
  news entry for PR #1094

diff --cc NEWS
index 955decacf4c5c5c31ac414f974c94b67583b64cd,a91137ea8d469bd0a59acb7837ccd5c498d2bf06..6acebcd313175daef0dd1db3161d1c6e54d703a0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -56,48 -24,10 +56,49 @@@ PH
    . Fixed bug #70896 (gmp_fact() silently ignores non-integer input). (Sara)
  
  - Mbstring:
 -  . Implemented request #66024 (mb_chr() and mb_ord()) (Masakielastic, Yasuo)
 -  . Implemented request #65081 (mb_scrub()) (Masakielastic, Yasuo)
 +  . Implemented request #66024 (mb_chr() and mb_ord()). (Masakielastic, Yasuo)
 +  . Implemented request #65081 (mb_scrub()). (Masakielastic, Yasuo)
    . Implemented request #69086 (enhancement for mb_convert_encoding() that
 -    handles multibyte replacement char nicely) (Masakielastic, Yasuo)
 +    handles multibyte replacement char nicely). (Masakielastic, Yasuo)
 +  . Added array input support to mb_convert_encoding(). (Yasuo)
 +  . Added array input support to mb_check_encoding(). (Yasuo)
++  . Fixed bug #69079 (enhancement for mb_substitute_character). (masakielastic)
  
 -<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
 +- Mcrypt:
 +  . The deprecated mcrypt extension has been moved to PECL. (leigh)
 +
 +- mysqlnd:
 +  . Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE). 
 +      (vanviegen)
 +
 +- PDO:
 +  . Add "Sent SQL" to debug dump for emulated prepares. (Adam Baratz)
  
 +- PDO_DBlib:
 +  . Fixed bug #73234 (Emulated statements let value dictate parameter type).
 +    (Adam Baratz)
 +  . Fixed bug #73396 (bigint columns are returned as strings). (Adam Baratz)
 +
 +- Session:
 +  . Fixed bug #73461 (Prohibit session save handler recursion). (Yasuo)
 +  . PR #2233 Removed register_globals related code and "!" can be used as $_SESSION key name. (Yasuo)
 +  . Improved bug #73100 fix. 'user' save handler can only be set by session_set_save_handler()
 +
 +- SOAP:
 +  . Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient)
 +    (Keith Smiley)
 +
 +- SQLite3:
 +  . Update to Sqlite 3.15.2. (cmb)
 +
 +- Standard:
 +  . Add subject to mail log. (tomsommer)
 +
 +- XML:
 +  . Moved utf8_encode() and utf8_decode() to the Standard extension. (Andrea)
 +  . Fixed bug #72135 (malformed XML causes fault) (edgarsandi)
 +
 +- XMLRPC:
 +  . Use Zend MM for allocation in bundled libxmlrpc (Joe)
 +
 +<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

diff --cc ext/mbstring/mbstring.c
Simple merge