From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 Sep 2007 19:00:46 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6d43c759c9495118ef3c088fd2d06fd09c4fda8f;p=collectd.git

Merge branch 'collectd-4.0'
---

6d43c759c9495118ef3c088fd2d06fd09c4fda8f