From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 30 Apr 2008 08:59:32 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.0~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d22aee658210cbfa44caa39f302aa9331d4eab82;p=collectd.git

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

d22aee658210cbfa44caa39f302aa9331d4eab82