From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 2 Dec 2008 22:31:32 +0000 (+0100)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~137
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=98fef31471541485002b5b87afa8991a280190d6

Merge branch 'collectd-4.5'
---

98fef31471541485002b5b87afa8991a280190d6