From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 11:45:25 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~158
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bab707fe46b2ef69f391864f3bb08b4dca19634e;p=collectd.git

Merge branch 'collectd-4.4'
---

bab707fe46b2ef69f391864f3bb08b4dca19634e