]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 14 Aug 2014 23:59:14 +0000 (16:59 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 15 Aug 2014 00:00:36 +0000 (17:00 -0700)
commit418563320788cb70c9319c3625669fea53afa295
treecdc655f95cc6254ef4f598229ccd74ab4290812d
parentd1dd71454d4ff9b6207c3ab73893f54da62cc3cf
parentad492ca9327fc9f7f0ea7a0ddd32e62cdf0c9137
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
NEWS