From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 20 May 2009 09:02:17 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~112
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e40c5242ad2ad284425bef8bb0958510c36c7870;p=collectd.git

Merge branch 'collectd-4.7'
---

e40c5242ad2ad284425bef8bb0958510c36c7870