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

Merge branch 'collectd-4.8'
---

b958bfe961cf8c6a442d18c714a9d04e947e6b74