Merge branch 'collectd-4.3'

author Florian Forster <octo@noris.net>

Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)

committer Florian Forster <octo@noris.net>

Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
author Florian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
committer Florian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
diff --cc configure.in
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/unixsock.c
Simple merge
author	Florian Forster <octo@noris.net>
	Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
committer	Florian Forster <octo@noris.net>
	Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/unixsock.c	patch \|	diff1 \|	diff2 \|	blob \| history