Code

Merge branch 'ff/fqdn'
authorFlorian Forster <octo@noris.net>
Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
committerFlorian Forster <octo@noris.net>
Tue, 13 Nov 2007 16:58:54 +0000 (16:58 +0000)
1  2 
src/collectd.conf.in
src/collectd.conf.pod
src/configfile.c

Simple merge
Simple merge
Simple merge