From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 3 Jun 2008 17:20:49 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~130
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c28bc580c110c78741d0805c7652e05d994b0ff4;p=collectd.git

Merge branch 'collectd-4.4'
---

c28bc580c110c78741d0805c7652e05d994b0ff4