Merge branch 'collectd-4.2'

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

Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)

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

Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
diff --cc src/logfile.c
Simple merge
diff --cc src/network.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)
		1	2
src/logfile.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history