]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorBoris Lytochkin <lytboris@php.net>
Fri, 3 May 2013 08:19:10 +0000 (12:19 +0400)
committerBoris Lytochkin <lytboris@php.net>
Fri, 3 May 2013 08:19:10 +0000 (12:19 +0400)
* PHP-5.4:
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)

1  2 
ext/snmp/snmp.c

diff --cc ext/snmp/snmp.c
Simple merge