diff options
| author | Anatol Belski <ab@php.net> | 2015-05-29 21:19:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-29 21:19:31 +0200 |
| commit | 042ecad749de54534ee8b970e8fc2bc00c2d88e0 (patch) | |
| tree | 63e162b023d6082596469e77b26f04ac38329e77 | |
| parent | 8eea193470e1faf0c3ca53f37b958ba6570e5ac8 (diff) | |
| parent | ff30d0319afa4f41620fee3f40e70583612508ba (diff) | |
| download | php-git-042ecad749de54534ee8b970e8fc2bc00c2d88e0.tar.gz | |
Merge branch 'PHP-5.6'PRE_PHP7_NSAPI_REMOVAL
* PHP-5.6:
updated NEWS
Refactored the fix for bug #66084, by cmb@php.net
Merge the fix for #69703 to 5.5 per request from Julien
0 files changed, 0 insertions, 0 deletions