Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 10 Mar 2007 09:52:02 +0000 (10:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 10 Mar 2007 09:52:02 +0000 (10:52 +0100)
commitd246967f9483c508549f1723ec977cc8a19dbd4c
tree2f561d96ef25d5832c2e32f0ecfedc2c6e59a384
parent27eb0061898f9e90e70546d361baae2151db8f61
parenta1c44684e780fdc52dcd31d4cff3d89122ee2a84
Merge branch 'pull/collectd-4' into collectd-4