From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 10:47:44 +0000 (+0100)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.9.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9622e4d30f90e9eefca1d43fefc6bf85785074d3;p=collectd.git

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

9622e4d30f90e9eefca1d43fefc6bf85785074d3