From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 20 Aug 2008 07:20:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.3~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=66e0fe82631c8a8e44ffcad8ffd378fab83bc83f;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4
---

66e0fe82631c8a8e44ffcad8ffd378fab83bc83f