Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)

Trivial merge