From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Dec 2009 12:13:53 +0000 (+0100)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~86
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c7565f60af85bff6e04b52bed4703cf9ab35f3eb;p=collectd.git

Merge branch 'collectd-4.9'
---

c7565f60af85bff6e04b52bed4703cf9ab35f3eb