Merge branch 'collectd-4.10'

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

Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)

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

Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/collectd.h
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/network.c
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 6 Nov 2010 11:11:23 +0000 (12:11 +0100)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/curl_json.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history