From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 6 May 2009 08:44:00 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2bf02b4f5bf4a22395b57bba6715dada3859612;p=collectd.git

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

a2bf02b4f5bf4a22395b57bba6715dada3859612