]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 18 Oct 2017 15:27:21 +0000 (18:27 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 18 Oct 2017 15:27:21 +0000 (18:27 +0300)
* 'master' of git.php.net:php-src:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+


Trivial merge