Merge branch 'pull/collectd-4'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Fri, 20 Apr 2007 06:20:28 +0000 (08:20 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Fri, 20 Apr 2007 06:20:28 +0000 (08:20 +0200)
commit4059b7f729ee092d59d41a92804c83c1dd0d5332
treeb67d71e194925a999b43c41a8735f33fd9ebaa79
parent3acac9b09b484d234b3c6a4a3be1642defac9c10
parentee13823dc29bbcc1e8c24b82705cfa736809fa02
Merge branch 'pull/collectd-4'