Merge branch 'ph/ipmi'

author Florian Forster <octo@huhu.verplant.org>

Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)

committer Florian Forster <octo@huhu.verplant.org>

Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
author Florian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
committer Florian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
diff --cc AUTHORS
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@huhu.verplant.org>
	Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
committer	Florian Forster <octo@huhu.verplant.org>
	Tue, 19 Aug 2008 09:19:08 +0000 (11:19 +0200)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history