]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 29 Jan 2014 08:57:04 +0000 (09:57 +0100)
committerRemi Collet <remi@php.net>
Wed, 29 Jan 2014 08:57:04 +0000 (09:57 +0100)
* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path


Trivial merge