Merge branch 'collectd-4.4'

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

Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)

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

Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
author Florian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
diff --cc src/memcached.c
Simple merge
diff --cc src/plugin.c
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Thu, 21 Aug 2008 15:24:40 +0000 (17:24 +0200)
		1	2
src/memcached.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history