Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:09:46 +0000 (17:09 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:09:46 +0000 (17:09 +0200)
commitc60c6dfa5960b23bdc59341ae73e701dd59d4305
treed986b27cefe99c501cf3991fee9b58b8b0fa9338
parent889ca6f42e5b2f567ea038a35f8e82209edc0eeb
parente8c6efb8bf77e835c28ff2c14f13aecbb73e3e28
Merge branch 'collectd-4.3' into collectd-4.4
configure.in
src/disk.c
src/network.c
src/plugin.h