]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10a957e 4475cbd)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 17 Nov 2014 05:58:28 +0000 (06:58 +0100)
committerRemi Collet <remi@php.net>
Mon, 17 Nov 2014 05:58:28 +0000 (06:58 +0100)
* PHP-5.5:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address


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