From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Dec 2009 12:11:51 +0000 (+0100)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.9.0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ad3a491af300d7336112607e20b0364d1f3f2bb;p=collectd.git

Merge branch 'collectd-4.8' into collectd-4.9
---

5ad3a491af300d7336112607e20b0364d1f3f2bb