]> granicus.if.org Git - php/commit
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)
commit0fad6dbef3853244342c0238bd23b14b41bed279
treeb46471b393a842bfc5ed8e95429701654ea89c6f
parenta6ac64bdbbf9e299377d0e9a063f496e7fcdc99a
parentda84f3af751aa9bbf76bc22924a488f981d47088
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path