]> granicus.if.org Git - php/commit
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)
commitf578bb038874098140f408468a3999fe7dc7fc6c
tree20fac338c993651a8f6af9ef6166eb72a175ddc7
parent0720804e7cac9b221de9c0994d11de19b1c14037
parentb3aa3c26168df33fd739669bb7ede2af88051158
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and