]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 31 Jul 2013 16:01:54 +0000 (09:01 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 31 Jul 2013 16:01:54 +0000 (09:01 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.


Trivial merge