]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d69b3d8 fd8f454)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 12:34:26 +0000 (16:34 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 12:34:26 +0000 (16:34 +0400)
commit35872e101be0c4931b54b8ad94ba055c7aeee434
treec16262e16b5cf015e6737b54c3b6a8460dee7301tree | snapshot
parentd69b3d8f5955a51ec688a52ceb925705d393821dcommit | diff
parentfd8f45452032720d3239af2106434232c95249e2commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
NEWS
NEWS diff1 | diff2 | blob | history
ext/soap/soap.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.