]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 14 Nov 2017 21:54:35 +0000 (00:54 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 14 Nov 2017 21:54:35 +0000 (00:54 +0300)
* 'master' of git.php.net:php-src:
  Try to fix AppVeyor build
  Reduce sleep intervals in basic sleep tests
  Initialize jit global
  Fix wrong return
  Clarify bin_to_readable code


Trivial merge