]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 22 Apr 2013 17:00:13 +0000 (19:00 +0200)
committerAnatol Belski <ab@php.net>
Mon, 22 Apr 2013 17:00:13 +0000 (19:00 +0200)
* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and


Trivial merge