]> granicus.if.org Git - php/commitdiff
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)
* 'PHP-5.6' of git.php.net:/php-src:
  fix NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time


Trivial merge