From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Apr 2008 12:04:47 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.3~3
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=1584314f015f98abc61e74fdd6e47e200c8d02aa

Merge branch 'collectd-4.2' into collectd-4.3
---

1584314f015f98abc61e74fdd6e47e200c8d02aa