Merge branch 'collectd-4.4'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
commit430b0b4d0275f7fea64376fc166e81fc0bcc36bf
treeb61c59ced9e457698184f90720752219cf1e0f02
parent1d6a83e9758aeba9f8cebac1d27bd94e46a83450
parentc60c6dfa5960b23bdc59341ae73e701dd59d4305
Merge branch 'collectd-4.4'
configure.in
src/disk.c
src/network.c
src/plugin.h
src/wireless.c