From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 18 Mar 2009 17:41:27 +0000 (+0100)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~106
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e4b8a186516b61f16d94a76db0aa102a3270d46c;p=collectd.git

Merge branch 'collectd-4.6'
---

e4b8a186516b61f16d94a76db0aa102a3270d46c