]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' PRE_PHP7_NSAPI_REMOVAL
authorAnatol Belski <ab@php.net>
Fri, 29 May 2015 19:19:31 +0000 (21:19 +0200)
committerAnatol Belski <ab@php.net>
Fri, 29 May 2015 19:19:31 +0000 (21:19 +0200)
* 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


Trivial merge