From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:28:51 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~38
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c88e459eb3823b766fc3a9ed37f25bc1f630146c;p=collectd.git

Merge branch 'collectd-4.2'
---

c88e459eb3823b766fc3a9ed37f25bc1f630146c