From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 08:58:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~10
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9fcc56456620f6f5663e7b2ca2168d612dc6bd6c

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

9fcc56456620f6f5663e7b2ca2168d612dc6bd6c