Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)
Conflicts:
src/snmp.c

1  2 
configure.in
src/Makefile.am
src/snmp.c

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/snmp.c
Simple merge