From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 28 Feb 2008 22:06:16 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.1~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6e855e6ab3bc654a3d6238c75102c66785de8bda;p=collectd.git

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

6e855e6ab3bc654a3d6238c75102c66785de8bda