From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 12 Aug 2008 09:31:26 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.3~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f;p=collectd.git

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

7a36927e0c5411c701d9e1bfd3f02a9c2f254d0f