]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:05:03 +0000 (17:05 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:05:03 +0000 (17:05 -0700)
* PHP-5.4:
  split the glob() test to test different basedir


Trivial merge