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

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

0384380080a39adb252a4d5dd3a6bf5c27f8faf8