From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 6 May 2009 08:43:47 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~13^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a1ae4b5afaf3207a7070b85f802b41b32c0b9a20;p=collectd.git

Merge branch 'collectd-4.5' into collectd-4.6
---

a1ae4b5afaf3207a7070b85f802b41b32c0b9a20