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)
commit0352eb93e70fb471d4975823db38147d2661f4bf
tree9c2b45fa44976181853b44881d55d954e7bf3e97
parentcd9f575473775152f0a8ff31be5679b9a56a697f
parentbc2d94024d0250211c1e498db1b43bb4525324da
Merge branch 'pull/collectd-4' into collectd-4
src/collectd.conf.in
src/collectd.conf.pod