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)
commitc9db0c1a0dd6af026c3fbbf934eec02bd32bf043
treefcc4f0ce12f92f42f662001942205ccdf6f4a743
parent062c88e486b4b1a09d7dd416c07a2678b4dd7b21
parent6c9b15cd22b4c1f56b5012b89dd12f0996fa0e4e
Merge branch 'ff/fqdn'
src/collectd.conf.in
src/collectd.conf.pod
src/configfile.c