From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 30 Jul 2013 23:24:04 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9e2dc80844e0f371a3a7f5b40933a5938a240f4;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
---

d9e2dc80844e0f371a3a7f5b40933a5938a240f4