From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 19 Aug 2010 13:02:41 +0000 (+0200)
Subject: Merge branch 'collectd-4.9' into collectd-4.10
X-Git-Tag: collectd-4.10.2~7
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=97addf1e406c75be500ae020635f3cb389f206e0

Merge branch 'collectd-4.9' into collectd-4.10
---

97addf1e406c75be500ae020635f3cb389f206e0