From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 9 Dec 2009 15:50:42 +0000 (+0100)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=973b70c411688212c081f5e90b89bd657785b81c;p=collectd.git

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

973b70c411688212c081f5e90b89bd657785b81c