Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:51 +0000 (16:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:51 +0000 (16:00 +0200)
commit4320ac5ec142c87bcf634cd85b89eadea65011ff
tree35aaa99c97458d59c2c82d21508980864df39758
parentdfc5991a84eac7729893bd032db09ecdc199cd2e
parentaa39b2bf774bf297f6c1a3967764bd7d84e0a49f
Merge branch 'collectd-4.0' into collectd-4.1