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)
commitab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b
treeff233efefb7e6868da8c5183ff08b81c4638cc29
parentd19bcbf5c310f3656503e64ba26829256112ded4
parent0c78d3b700d6c9cf1c4c5129187a553751a11710
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/snmp.c
configure.in
src/Makefile.am
src/snmp.c