Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 30 Mar 2007 20:04:16 +0000 (22:04 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 30 Mar 2007 20:04:16 +0000 (22:04 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge