From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 12 Jun 2007 06:55:29 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~58
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1fab9727d3020c9c733aab0ab2386f593bd52a11;p=collectd.git

Merge branch 'collectd-4.0'
---

1fab9727d3020c9c733aab0ab2386f593bd52a11