![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100) | ||
| commit | d1483d2e2a9116c233aeaceba99fa58a7e6bdc87 | |
| tree | 98ee1a999325ad0d86b5f0ffb173871f2f25a7d5 | tree | snapshot |
| parent | afdbcde73c266ec4123e9018c5e325c4d324bfb1 | commit | diff |
| parent | 89b7a6dfb77e5529e5089bf6593ed9fd83202429 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.3
Conflicts:
src/collectd.conf.pod
Conflicts:
src/collectd.conf.pod
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/ipmi.c | diff1 | | diff2 | | blob | history |