From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 4 Sep 2008 13:01:23 +0000 (+0200)
Subject: Merge branch 'collectd-4.4'
X-Git-Tag: collectd-4.5.0~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=7471e073bff7c9f2542bc1c8ce639b85c5498ba7

Merge branch 'collectd-4.4'
---

7471e073bff7c9f2542bc1c8ce639b85c5498ba7