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

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

1ef654ef7d8225667666b206819d63689dd3b2e4