]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:07:59 +0000 (13:07 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:09:08 +0000 (13:09 -0700)
commit3d00867bbace3a500f6ff595be9c07eea073f28b
tree70874940834b21312e68eebb8e1e625016963f0f
parent3477568b4e95b90c3cfd329a0fe7fc97d2b66d74
parent3dfccd7ba5a9ef88f3c40b710010a4e4ba2e662e
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
NEWS