]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAdam Harvey <aharvey@php.net>
Tue, 1 Dec 2015 03:10:04 +0000 (03:10 +0000)
committerAdam Harvey <aharvey@php.net>
Tue, 1 Dec 2015 03:10:04 +0000 (03:10 +0000)
* PHP-7.0:
  Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).


Trivial merge