]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 12 Dec 2013 09:46:36 +0000 (10:46 +0100)
committerAnatol Belski <ab@php.net>
Thu, 12 Dec 2013 09:46:36 +0000 (10:46 +0100)
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64


Trivial merge