From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 24 Feb 2009 09:15:52 +0000 (+0100)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~116
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f2938fd5c5f934521292acaee7e6e7d0f55b0113;p=collectd.git

Merge branch 'collectd-4.6'
---

f2938fd5c5f934521292acaee7e6e7d0f55b0113