From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 22 Aug 2007 14:37:29 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.0.7~6^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4b1af5819e5574e49c3f94c88d1c7cb4682ae941;p=collectd.git

Merge branch 'pull/collectd-4.0' into collectd-4.0
---

4b1af5819e5574e49c3f94c88d1c7cb4682ae941