From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Dec 2009 12:11:25 +0000 (+0100)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a86c1a6b695f5f967fb102da12a9f93dcee26ed3;p=collectd.git

Merge branch 'collectd-4.7' into collectd-4.8
---

a86c1a6b695f5f967fb102da12a9f93dcee26ed3