]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Fri, 1 Feb 2013 11:32:00 +0000 (12:32 +0100)
committerJohannes Schlüter <johannes@php.net>
Fri, 1 Feb 2013 11:32:00 +0000 (12:32 +0100)
1  2 
ext/snmp/snmp.c

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