Merge branch 'collectd-3.11' into merge/collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 11 Feb 2007 14:39:58 +0000 (15:39 +0100)
commitb8be503b2b50366a9c498ba7e4ab66a228c6dfbf
tree48390063e601e7e273e98437275954769a26f0f3
parent79d36d9eb61ac09f253769feff144383b2b665c9
parentd51a3768cc3302215ecf1f125a6f6d85ac246760
Merge branch 'collectd-3.11' into merge/collectd-4

Conflicts:

src/multimeter.c
src/plugin.c
configure.in