From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 28 Sep 2007 14:42:13 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.1.3~4^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ebf2e171eb457394e498cada2be85bcef24d6221;p=collectd.git

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

ebf2e171eb457394e498cada2be85bcef24d6221