From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 14 Nov 2009 08:01:10 +0000 (+0100)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~40
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=b5ed3c9b617ba78a98f3ef279bb3efa325536080

Merge branch 'collectd-4.8'
---

b5ed3c9b617ba78a98f3ef279bb3efa325536080