From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 9 Dec 2009 15:51:24 +0000 (+0100)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~13
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=71cc6701e311071e1d9bfebbe53f9ac324cc7dfb;p=collectd.git

Merge branch 'collectd-4.8'
---

71cc6701e311071e1d9bfebbe53f9ac324cc7dfb