From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 21 Aug 2008 15:24:40 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~54^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5b5f7f4e3dd28d9e41469c331f3f9f6a09e3147b;p=collectd.git

Merge branch 'collectd-4.4'
---

5b5f7f4e3dd28d9e41469c331f3f9f6a09e3147b