]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:06:17 +0000 (13:06 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Mar 2015 20:06:17 +0000 (13:06 -0700)
commit4a2e6137305971afc6702623e9295428a83868a6
treeae02b4a19d83613144e0631503cf2d93867e8cb3
parent34418222d784f0b3666649fb9afb05ffcf5cedb7
parentbfb669891e02ba36f27f7807a3e114a57d78823c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)