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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  comment about ipv4-mapped in fpm conf
  Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
---

f22e0c0a6ad05805344d495ed33e8cbc8e56ebf5