]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Fri, 18 Mar 2016 03:50:38 +0000 (11:50 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 18 Mar 2016 03:50:38 +0000 (11:50 +0800)
* PHP-7.0:
  Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex

1  2 
ext/pdo/pdo_stmt.c

Simple merge