From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Wed, 8 Aug 2007 19:43:08 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0'
X-Git-Tag: collectd-4.1.0~30
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=988688ace2eee6b19595c780ef776785b387f80d

Merge branch 'pull/collectd-4.0'
---

988688ace2eee6b19595c780ef776785b387f80d