Merge branch 'pull/collectd-4.2' into collectd-4.2
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)
commitff4ebc0fd3c93a39a18edc629d61787f60a92706
tree329a66776dfdf6215863888d36fb915fc0cb0230
parent0b88f6888705e92ce4472435a464730cf2ce2d5a
parentf71467d9c2097ddd9eb772a4fdb985663168ec71
Merge branch 'pull/collectd-4.2' into collectd-4.2