From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 11:45:14 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.0~9
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=af46a5f31a0e8d4279d63d8ca9232dbd433dfb25

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

af46a5f31a0e8d4279d63d8ca9232dbd433dfb25