]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f41a7b9 25e65a7)
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Fri, 3 Oct 2014 09:39:09 +0000 (11:39 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 3 Oct 2014 09:39:09 +0000 (11:39 +0200)
* PHP-5.5:
  NEWS entry for previous commit
  add IPv6 support to php-fpm


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