From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 2 Sep 2007 17:28:25 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edc842a72e095b67348ed96d287c857ead49d229;p=collectd.git

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

edc842a72e095b67348ed96d287c857ead49d229