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


Trivial merge