]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierrick Charron <pierrick@php.net>
Fri, 16 Nov 2012 23:29:59 +0000 (18:29 -0500)
committerPierrick Charron <pierrick@php.net>
Fri, 16 Nov 2012 23:29:59 +0000 (18:29 -0500)
* PHP-5.5:
  Regenerate Zend ini scanner


Trivial merge