projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61cae17 d207e65)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Sun, 18 Nov 2012 22:20:57 +0000 (14:20 -0800)
committerChristopher Jones <sixd@php.net>
Sun, 18 Nov 2012 22:20:57 +0000 (14:20 -0800)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.