From: Joe Watkins <krakjoe@php.net>
Date: Thu, 5 Jan 2017 06:54:52 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~641
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4aada085ebe1a4bb16481f1d2ec9739fb81c6844;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix php-fpm.service.in
---

4aada085ebe1a4bb16481f1d2ec9739fb81c6844