From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 3 Dec 2008 21:50:50 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec404735b0676bb44fdba10f3760e1ba9632405a;p=collectd.git

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

ec404735b0676bb44fdba10f3760e1ba9632405a