]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 13:27:07 +0000 (21:27 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 17 Mar 2016 13:27:07 +0000 (21:27 +0800)
* 'master' of git.php.net:/php-src:
  fix NEWS
  NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor


Trivial merge