Merge branch 'collectd-4.2' into collectd-4.3

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

Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)

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

Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
diff --cc configure.in
Simple merge
diff --cc src/exec.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/exec.c	patch \|	diff1 \|	diff2 \|	blob \| history