From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Sep 2007 09:01:40 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.2~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=756704084860d8ad21db61f2a677cbd80b008be4;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1
---

756704084860d8ad21db61f2a677cbd80b008be4