]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 12:35:09 +0000 (16:35 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 12:35:09 +0000 (16:35 +0400)
* PHP-5.5:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
NEWS


Trivial merge