Merge branch 'pull/collectd-4.3' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:56:22 +0000 (09:56 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:56:22 +0000 (09:56 +0100)
commite88e5b49dd3cc026d162b64ca100415481756169
treefa9c768531dd40e4b3803efe058914a606ea3670
parentbc0a8f260e4e24bdf664c3dcff919b6f99bfe31d
parent3bb58d8d87a0db2b3177cbc52c2078c5543e7944
Merge branch 'pull/collectd-4.3' into collectd-4.3