]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 6 Jan 2017 05:55:14 +0000 (05:55 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 6 Jan 2017 05:55:14 +0000 (05:55 +0000)
* PHP-7.0:
  fix inappropriate warning in FPM log


Trivial merge