From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Mon, 22 Jan 2007 21:55:50 +0000 (+0100)
Subject: Merge branch 'pull/collectd-4'
X-Git-Tag: collectd-4.0.0-rc4~128
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5bee85b6d9b15a57a4d555cde72a994e2dc73b1;p=collectd.git

Merge branch 'pull/collectd-4'
---

e5bee85b6d9b15a57a4d555cde72a994e2dc73b1