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

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

e21d0408e4e4001b8c66bb1ea7d41b890100d0f5