]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Thu, 12 Dec 2013 10:00:03 +0000 (14:00 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 12 Dec 2013 10:00:03 +0000 (14:00 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64


Trivial merge