Code

Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)

Trivial merge