Code

Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Aug 2008 18:47:39 +0000 (20:47 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 25 Aug 2008 18:47:39 +0000 (20:47 +0200)

Trivial merge