From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 1 May 2010 07:35:01 +0000 (+0200)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.10.0~3^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0bd574a28c06090f0c4b056f8a78e455455a6330;p=collectd.git

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

0bd574a28c06090f0c4b056f8a78e455455a6330