From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 21 Aug 2008 15:24:32 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.3~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d9ba7e3ed5d93e9abd34f961fff51676a096ac02

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

d9ba7e3ed5d93e9abd34f961fff51676a096ac02