From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 17 Sep 2009 07:40:28 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4374305bd9523620d4291c9be5bfd81640f789a7;p=collectd.git

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

4374305bd9523620d4291c9be5bfd81640f789a7