Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:31:49 +0000 (19:31 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:32:33 +0000 (19:32 +0100)
commit619f112a584fcd89d2e8df7781a0a01341188189
tree7c1b66cbc898b2e2d11a50b5d335889426c48cbb
parent6e2b4380c02a6edb039b73caf654455a758df9aa
parent5fa56b89181a51398f9bbb63c440e7630f12e56c
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:

ChangeLog
version-gen.sh

The changes made in b6612126 and reverted in 5fa56b89 are retained in
collectd-4.6.
ChangeLog
src/ipmi.c