Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Sun, 16 Jul 2006 13:35:22 +0000 (15:35 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sun, 16 Jul 2006 13:35:22 +0000 (15:35 +0200)

Trivial merge