]> granicus.if.org Git - php/commit
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)
commit9ec3bb8a98abc40637f39936fae2f6313d96be6a
treea3112fa2cc5308b5ebdc463f33523a509ce71af6
parent56ad2fcf2088da99cf30963440cd70e04ba227e1
parentb1f3403c9815c05fd14bdcc5954e58e25810bf1f
Merge branch 'PHP-5.6'

* PHP-5.6:
  regenerated the ini scanner
Zend/zend_ini_scanner.c