![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 22 Feb 2009 18:31:49 +0000 (19:31 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 22 Feb 2009 18:32:33 +0000 (19:32 +0100) | ||
| commit | 619f112a584fcd89d2e8df7781a0a01341188189 | |
| tree | 7c1b66cbc898b2e2d11a50b5d335889426c48cbb | tree | snapshot |
| parent | 6e2b4380c02a6edb039b73caf654455a758df9aa | commit | diff |
| parent | 5fa56b89181a51398f9bbb63c440e7630f12e56c | commit | diff |
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.
Conflicts:
ChangeLog
version-gen.sh
The changes made in b6612126 and reverted in 5fa56b89 are retained in
collectd-4.6.
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/ipmi.c | diff1 | | diff2 | | blob | history |