]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 15:07:52 +0000 (17:07 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 15:07:52 +0000 (17:07 +0200)
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*


Trivial merge