Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100)
commitd1483d2e2a9116c233aeaceba99fa58a7e6bdc87
tree98ee1a999325ad0d86b5f0ffb173871f2f25a7d5
parentafdbcde73c266ec4123e9018c5e325c4d324bfb1
parent89b7a6dfb77e5529e5089bf6593ed9fd83202429
Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
src/collectd.conf.pod
src/collectd.conf.pod
src/ipmi.c