Merge branch 'collectd-4.10'

author Florian Forster <octo@huhu.verplant.org>

Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)

committer Florian Forster <octo@huhu.verplant.org>

Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
author Florian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/dns.c
Simple merge
diff --cc src/java.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/dns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/java.c	patch \|	diff1 \|	diff2 \|	blob \| history