From: Remi Collet <remi@php.net>
Date: Sun, 16 Nov 2014 17:00:24 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10a957ed3501d2005bfed7356036121384d9c52e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improve comments about FPM listen option
---

10a957ed3501d2005bfed7356036121384d9c52e