]> granicus.if.org Git - php/commitdiff
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)
* commit 'a03f094':
  We shouldn't load any local ini files for these tests


Trivial merge