Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)
commit29a9c44c3599a44d55dbb0157aa61c04ac175206
treecb413d217868b48d9d33e144e8a6d65918f3a929
parent805c49402bce0fa123639d3476913d2bb5713c90
parentfd028d752c313ca53d628df5426c63c12838610e
Merge branch 'pull/collectd-4.0' into collectd-4.0