]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 09:40:37 +0000 (17:40 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 09:40:37 +0000 (17:40 +0800)
* 'PHP-7.1' of git.php.net:/php-src:
  prepare next
  fix php_version.h


Trivial merge