]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorSara Golemon <pollita@php.net>
Thu, 12 May 2016 02:51:14 +0000 (02:51 +0000)
committerSara Golemon <pollita@php.net>
Thu, 12 May 2016 02:51:14 +0000 (02:51 +0000)
* PHP-7.0:
  Fix serializing ZEND_AST_SHELL_EXEC

1  2 
Zend/zend_ast.c

diff --cc Zend/zend_ast.c
Simple merge