]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Fri, 14 Nov 2014 18:10:19 +0000 (19:10 +0100)
committerRemi Collet <remi@php.net>
Fri, 14 Nov 2014 18:10:19 +0000 (19:10 +0100)
* PHP-5.5:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address


Trivial merge