]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Thu, 17 Mar 2016 12:42:34 +0000 (13:42 +0100)
committerRemi Collet <remi@php.net>
Thu, 17 Mar 2016 12:42:34 +0000 (13:42 +0100)
commit2291ebc0ea9c71e6170f5331813f77ac6ef03026
treeed5164718e79b4813d640500df9f34681b33f147
parentb4eedd128ba9f61be08a50c94afd72837d7cf70b
parentd513b4cde5cdb25ea7f8fcd064ee98a6ffa53322
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time
ext/odbc/php_odbc.c