From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 1 Oct 2009 19:33:37 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=6c134837a38a566a6ad78225ef5e5c3cc9b7d832

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

6c134837a38a566a6ad78225ef5e5c3cc9b7d832