]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 16 May 2013 06:43:07 +0000 (08:43 +0200)
committerAnatol Belski <ab@php.net>
Thu, 16 May 2013 06:43:07 +0000 (08:43 +0200)
commitfda25c7ea68a35d55cc72368a344a787608a0b29
tree7e14ced299f9963954d84954eb8777e71ff6f590
parent9accfee55f80ec7da23bb948c49fcaa3e97bc2ca
parentd82704b6779cf54e9c8bd16ecc78c612892b4c9d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build
main/main.c