From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 16:34:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.8'
X-Git-Tag: collectd-4.9.0~77
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=beefe438cc1e7119e2ba448cb190ec9ffa0b8e9e

Merge branch 'collectd-4.8'
---

beefe438cc1e7119e2ba448cb190ec9ffa0b8e9e