Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:17:36 +0000 (20:17 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:17:36 +0000 (20:17 +0100)
commit179242223f25937fc528e89ef433a80d4d614611
treed88f2d660ba64394faf8c12ea19eebe4ed34dceb
parent91f44c9c9dbfa746fbe63b50c87fb8bf064d0daa
parent3c3bc4f67827b04e01f54acc03a78894fb5c2832
Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
src/snmp.c
src/Makefile.am
src/rrdcached.c
src/snmp.c