Merge branch 'ff/routeros'

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

Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)

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

Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
author Florian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
committer Florian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/configfile.c
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
committer	Florian Forster <octo@huhu.verplant.org>
	Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history