Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:23 +0000 (16:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:23 +0000 (16:00 +0200)
commitaa39b2bf774bf297f6c1a3967764bd7d84e0a49f
tree24dff71fab697791d8bb5837f45ea0ce7d8d3f29
parent3f5fc2f959affe8f2c40944aeed6c2bf75cf462c
parent4a642a32856091e40b00cec8cc0c37b91349394b
Merge branch 'pull/collectd-4.0' into collectd-4.0