From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 13 Jan 2010 11:11:20 +0000 (+0100)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.9.1~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=34f7eda9ad2cbd2cd5620c0a2d76d282e790b4de

Merge branch 'collectd-4.8' into collectd-4.9
---

34f7eda9ad2cbd2cd5620c0a2d76d282e790b4de