From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 25 Feb 2008 07:30:28 +0000 (+0100)
Subject: Merge branch 'collectd-4.3'
X-Git-Tag: collectd-4.4.0~87^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e390e8d4b386894f36b95d12311c018d7644fc76;p=collectd.git

Merge branch 'collectd-4.3'
---

e390e8d4b386894f36b95d12311c018d7644fc76