From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 3 Apr 2008 07:38:56 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.3~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1;p=collectd.git

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

79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1