From: Florian Forster <octo@huhu.verplant.org>
Date: Sun, 9 Jul 2006 08:16:49 +0000 (+0200)
Subject: Merge branch 'collectd-3.9'
X-Git-Tag: collectd-3.10.0~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fdf203eed0a91818db735105a4cc85effd7971d9;p=collectd.git

Merge branch 'collectd-3.9'
---

fdf203eed0a91818db735105a4cc85effd7971d9