From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 6 Nov 2010 11:11:23 +0000 (+0100)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~24
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a898c17330d9a2039bcdb8f7e6dbedba516a6cd8

Merge branch 'collectd-4.10'
---

a898c17330d9a2039bcdb8f7e6dbedba516a6cd8