From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 24 Mar 2008 12:36:05 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.2~2^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3bb58d8d87a0db2b3177cbc52c2078c5543e7944;p=collectd.git

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

3bb58d8d87a0db2b3177cbc52c2078c5543e7944