]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 17:18:54 +0000 (19:18 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 17:18:54 +0000 (19:18 +0200)
* PHP-5.4:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt


Trivial merge