]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Tue, 16 Jan 2018 06:54:05 +0000 (14:54 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 16 Jan 2018 06:54:05 +0000 (14:54 +0800)
* 'master' of git.php.net:/php-src:
  Removed recursive call
  Put ZEND_FASTCALL into the proper place.


Trivial merge