]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Thu, 12 May 2016 05:16:07 +0000 (13:16 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 12 May 2016 05:16:07 +0000 (13:16 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Fix serializing ZEND_AST_SHELL_EXEC
  add missing NEWS entry
  prepare for 5.6.22RC1
  add missing NEWS entry


Trivial merge