]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Sun, 18 Nov 2012 22:20:53 +0000 (14:20 -0800)
committerChristopher Jones <sixd@php.net>
Sun, 18 Nov 2012 22:20:53 +0000 (14:20 -0800)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value


Trivial merge