From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 7 Jun 2007 07:25:08 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4747e79c6e87d443e9f390f8a446521c29c66fb0;p=collectd.git

Merge branch 'collectd-4.0'
---

4747e79c6e87d443e9f390f8a446521c29c66fb0