From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 24 Jan 2009 10:04:22 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.6.0~19^2~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d3fc6d0831a63af2e96300f488a9f8f5fc3183fb

Merge branch 'collectd-4.4' into collectd-4.5
---

d3fc6d0831a63af2e96300f488a9f8f5fc3183fb