From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 6 Jun 2007 15:37:12 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~61
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=97e4d4b708fab4a513476b6462ee562c704bc711;p=collectd.git

Merge branch 'collectd-4.0'
---

97e4d4b708fab4a513476b6462ee562c704bc711