]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 10 Jan 2018 11:11:23 +0000 (14:11 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 10 Jan 2018 11:11:23 +0000 (14:11 +0300)
* 'master' of git.php.net:php-src:
  minor optimize on strstr


Trivial merge