Merge branch 'collectd-4.0'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 7 Jun 2007 07:25:08 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 7 Jun 2007 07:25:08 +0000 (09:25 +0200)
commit4747e79c6e87d443e9f390f8a446521c29c66fb0
treeb1596c75da81d91e7577f44aec39655bffcaadb5
parent97e4d4b708fab4a513476b6462ee562c704bc711
parentabc2bc29a3bf76e0acdecffaa40cb54e02112655
Merge branch 'collectd-4.0'