]> granicus.if.org Git - php/commit
Merge commit 'a03f094' into PHP-5.5
authorRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 20:23:44 +0000 (16:23 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 20:23:44 +0000 (16:23 -0400)
commitf17f596b27815f097d8831eed57d62eb06d0bd3c
treef679f90d8771286302f576477a4333a2ccb7cb66
parentd24f31c65e31f00c3b2f1e1f44248dd20ed49cd7
parenta03f0943ca0384b37083d371b121f23ad2054a83
Merge commit 'a03f094' into PHP-5.5

* commit 'a03f094':
  We shouldn't load any local ini files for these tests