Merge branch 'collectd-4.5' into collectd-4.6

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

Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)

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

Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
diff --cc src/common.c
Simple merge
diff --cc src/dns.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100)
		1	2
src/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history