From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 10 Jun 2008 15:09:46 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c60c6dfa5960b23bdc59341ae73e701dd59d4305;p=collectd.git

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

c60c6dfa5960b23bdc59341ae73e701dd59d4305