diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-07-31 16:34:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-07-31 16:34:26 +0400 |
| commit | 35872e101be0c4931b54b8ad94ba055c7aeee434 (patch) | |
| tree | c16262e16b5cf015e6737b54c3b6a8460dee7301 /netware | |
| parent | d69b3d8f5955a51ec688a52ceb925705d393821d (diff) | |
| parent | fd8f45452032720d3239af2106434232c95249e2 (diff) | |
| download | php-git-35872e101be0c4931b54b8ad94ba055c7aeee434.tar.gz | |
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
Diffstat (limited to 'netware')
0 files changed, 0 insertions, 0 deletions