Code

Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 4 Sep 2008 13:01:06 +0000 (15:01 +0200)

Trivial merge