]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 11:17:10 +0000 (13:17 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 11:17:10 +0000 (13:17 +0200)
* PHP-5.6:
  regenerated the ini scanner

1  2 
Zend/zend_ini_scanner.c

Simple merge