]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6da7301b347bde2331e99b27dcf3aac155b00df9
tree1d52d2bd6601912c3e9a25b6512e4a967fe55793tree | snapshot
parent61cae177be06f4f7f7f26ce21cdf306feafa489bcommit | diff
parentd207e6551b11e5fb0a0fad154048203ac73f8fe2commit | diff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* '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
Unnamed repository; edit this file 'description' to name the repository.