Merge branch 'collectd-4.4'

author Florian Forster <octo@leeloo.lan.home.verplant.org>

Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)

committer Florian Forster <octo@leeloo.lan.home.verplant.org>

Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
diff --cc configure.in
Simple merge
diff --cc src/disk.c
Simple merge
diff --cc src/network.c
Simple merge
diff --cc src/plugin.h
Simple merge
diff --cc src/wireless.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Tue, 10 Jun 2008 15:10:05 +0000 (17:10 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/disk.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/wireless.c	patch \|	diff1 \|	diff2 \|	blob \| history