Merge branch 'collectd-4.2' into collectd-4.3

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

Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)

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

Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)
diff --cc configure.in
Simple merge
diff --cc src/collectd-unixsock.pod
Simple merge
diff --cc src/liboconfig/parser.y
Simple merge
diff --cc src/perl.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 24 Mar 2008 12:36:05 +0000 (13:36 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd-unixsock.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/liboconfig/parser.y	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history