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

Merge branch 'collectd-4.8'
---

f21223850375057ea74f9e9f4feed264d98c8a78