From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 20 May 2009 09:02:06 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a7145dd5626503f411a4aed87f30fc0f9689c90;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7
---

5a7145dd5626503f411a4aed87f30fc0f9689c90