From: Florian Forster <octo@noris.net>
Date: Wed, 21 Oct 2009 08:20:27 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.2~10
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=071ba511ddd1245b1f56c28f1801ca37e9adfaa1;p=collectd.git

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

071ba511ddd1245b1f56c28f1801ca37e9adfaa1