Merge branch 'ph/ipmi'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
1  2 
AUTHORS
src/collectd.conf.pod

diff --cc AUTHORS
Simple merge
Simple merge