From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 13 Jan 2010 11:11:28 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~74
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=413c4dab34e5cbb227644dd3ead6e6e0a3cdb08c;p=collectd.git

Merge branch 'collectd-4.9'
---

413c4dab34e5cbb227644dd3ead6e6e0a3cdb08c