Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 6 Jun 2007 15:37:12 +0000 (17:37 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 6 Jun 2007 15:37:12 +0000 (17:37 +0200)
commit97e4d4b708fab4a513476b6462ee562c704bc711
treec7edbb1b930e06e40637b3d85f03980ab14ede83
parentfa9717086dd2591b99e138931ad716239578e415
parentaa93498f6187f4ca19cfbe1dc3caa73644f8237f
Merge branch 'collectd-4.0'