Merge branch 'collectd-4.9'

author Florian Forster <octo@noris.net>

Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)

committer Florian Forster <octo@noris.net>

Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
author Florian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
committer Florian Forster <octo@noris.net>
Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
diff --cc src/network.c
Simple merge
diff --cc src/plugin.c
Simple merge
author	Florian Forster <octo@noris.net>
	Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
committer	Florian Forster <octo@noris.net>
	Wed, 21 Apr 2010 17:05:15 +0000 (19:05 +0200)
		1	2
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history