]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51acb9d 23fd22f)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sun, 16 Nov 2014 17:00:24 +0000 (18:00 +0100)
committerRemi Collet <remi@php.net>
Sun, 16 Nov 2014 17:00:24 +0000 (18:00 +0100)
* PHP-5.5:
  improve comments about FPM listen option


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.