From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 25 Jun 2006 08:51:57 +0000 (+0200)
Subject: Merge branch 'v391-fix' into v392-fix
X-Git-Tag: collectd-3.9.2^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=20b5c36871fae3f86024da3b134e52351ddb77c5;p=collectd.git

Merge branch 'v391-fix' into v392-fix
---

20b5c36871fae3f86024da3b134e52351ddb77c5