Merge commit '5753b74' into PHP-5.5

* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
This commit is contained in:
Rasmus Lerdorf 2013-08-02 11:47:52 -04:00
commit a85e71e655

File diff suppressed because one or more lines are too long