]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 16 Jan 2018 10:51:50 +0000 (13:51 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 16 Jan 2018 10:51:50 +0000 (13:51 +0300)
* 'master' of git.php.net:php-src:
  Separate the cpuinfo initialization part and call it at startup


Trivial merge