Merge branch 'v391-fix' into v392-fix collectd-3.9.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)
commit20b5c36871fae3f86024da3b134e52351ddb77c5
tree040028bf2f61fda33423c8ddaff92ebba7c963e7
parentc5e84aabf023d1e7e8bdba97717e046c91b7b338
parenta073c1d52cc236c497f1a38c06433a70a7155616
Merge branch 'v391-fix' into v392-fix