]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:54 +0000 (20:53 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 18 Feb 2008 19:53:54 +0000 (20:53 +0100)

Trivial merge