From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 28 Jan 2007 11:24:21 +0000 (+0100)
Subject: Merge branch 'collectd-4' into ff/unixsock
X-Git-Tag: collectd-4.0.0-rc4~126^2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d728c9a78bff302df746686deb1d45162f264e89;p=collectd.git

Merge branch 'collectd-4' into ff/unixsock
---

d728c9a78bff302df746686deb1d45162f264e89