]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Thu, 5 Jan 2017 06:54:52 +0000 (06:54 +0000)
committerJoe Watkins <krakjoe@php.net>
Thu, 5 Jan 2017 06:54:52 +0000 (06:54 +0000)
* PHP-7.1:
  Fix php-fpm.service.in


Trivial merge