]> granicus.if.org Git - php/commitdiff
Merge commit '5753b74'
authorRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 15:48:07 +0000 (11:48 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 2 Aug 2013 15:48:07 +0000 (11:48 -0400)
* commit '5753b74':
  Make sure test.php isn't coming in from the include_path


Trivial merge