From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 19 Aug 2008 07:25:46 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
X-Git-Tag: collectd-4.3.4~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c146aa8a58c370ced66a869a49028232b6bd9bdf;p=collectd.git

Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
---

c146aa8a58c370ced66a869a49028232b6bd9bdf