Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:14 +0000 (13:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:14 +0000 (13:45 +0200)

Trivial merge