Merge branch 'collectd-4.6' into collectd-4.7

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

Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)

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

Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
diff --cc src/dns.c
Simple merge
diff --cc src/libcollectdclient/client.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
		1	2
src/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libcollectdclient/client.c	patch \|	diff1 \|	diff2 \|	blob \| history