]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:06:11 +0000 (08:06 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:06:11 +0000 (08:06 +0100)
* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)


Trivial merge