Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)

Trivial merge