Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Sep 2007 09:01:40 +0000 (11:01 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Sep 2007 09:01:40 +0000 (11:01 +0200)
commit756704084860d8ad21db61f2a677cbd80b008be4
treec0c78ad3dcc1629c5563c10eb2a46af7c3339078
parent5d26a6607fc53f416e42dccbc3fcda5d9b142625
parent7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e
Merge branch 'collectd-4.0' into collectd-4.1