Merge branch 'ag/curl_xml'

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

Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)

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

Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)
author Florian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)
diff --cc configure.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history