Code

Merge branch 'pull/collectd-4.0'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 8 Aug 2007 19:43:08 +0000 (21:43 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 8 Aug 2007 19:43:08 +0000 (21:43 +0200)
commit988688ace2eee6b19595c780ef776785b387f80d
treef0c892ec66f7dbcb043bcbecf0b6a12a9c655331
parent1ec7adf09a1df8b4b38330869c95a12eca15017a
parentfddaa30e57f79ddcc59e57ab496323b45907e7ba
Merge branch 'pull/collectd-4.0'