From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 10:54:52 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~77
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=13da81f864686e51b41a088edb63fd47d57806bd

Merge branch 'collectd-4.9'
---

13da81f864686e51b41a088edb63fd47d57806bd