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


Trivial merge