Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:22:53 +0000 (10:22 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Oct 2012 08:22:53 +0000 (10:22 +0200)
commit5fb8bff2b2d2d5c61621c6686b343d7e0eea48f0
treee08fa1d3895b55560a6a5e7b19a2ad655abcbbf1
parent4d3766818c0c3cbcb87331809868345f18351b10
parentab6ab6ad6428ba0a0987a20a7d1cfa47d6cc6f8b
Merge branch 'collectd-5.0' into collectd-5.1

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