Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Jul 2007 20:16:17 +0000 (22:16 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Jul 2007 20:16:17 +0000 (22:16 +0200)
commite4080f7aea79ffa3ad21fb2c8e6be311b1a404b9
treec0e10f5290601c150847d5b7c5e00c304e9fe16c
parentc5bab65db542b276a776dc0643abcea91da60913
parentd4b6af75ff51019682b054b581abf85a391d13bc
Merge branch 'collectd-4.0'

Conflicts:

configure.in
configure.in
src/hddtemp.c
src/mbmon.c
src/ntpd.c