Merge branch 'collectd-4.5' into collectd-4.6

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

Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)

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

Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
diff --cc src/ntpd.c
Simple merge
diff --cc src/rrdtool.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
		1	2
src/ntpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/rrdtool.c	patch \|	diff1 \|	diff2 \|	blob \| history