]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 30 Jul 2013 23:24:04 +0000 (03:24 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 30 Jul 2013 23:24:04 +0000 (03:24 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.


Trivial merge