Merge branch 'ff/fqdn'

author Florian Forster <octo@noris.net>

Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)

committer Florian Forster <octo@noris.net>

Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
author Florian Forster <octo@noris.net>
Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
committer Florian Forster <octo@noris.net>
Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/configfile.c
Simple merge
author	Florian Forster <octo@noris.net>
	Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
committer	Florian Forster <octo@noris.net>
	Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/configfile.c	patch \|	diff1 \|	diff2 \|	blob \| history