]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sun, 16 Nov 2014 17:01:01 +0000 (18:01 +0100)
committerRemi Collet <remi@php.net>
Sun, 16 Nov 2014 17:01:01 +0000 (18:01 +0100)
commit9e3ebd3a0d9919d75f526e2cef9bf35de8b4847f
tree8cc5ade1d56f2fcad531835e90c482cd2484dd7a
parentcac8e96738aa1557ad34f7221e547024ecaa52de
parent10a957ed3501d2005bfed7356036121384d9c52e
Merge branch 'PHP-5.6'

* PHP-5.6:
  improve comments about FPM listen option
sapi/fpm/php-fpm.conf.in