]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 13:27:23 +0000 (21:27 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 13:27:23 +0000 (21:27 +0800)
commiteb405623ec01d61ea34f5fb1d4c6f39c4eb187aa
tree949055b056af3da37017c4bf12484591bcd46fed
parent8e2f658f49c76c9feed894414fb3a8edb27beef0
parentb5b1ba850a4b60a0408ed0a1b8562b33e986291c
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  fix NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time