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

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

34e095d9e7c605ded713203f21e4f00c8d6b6d44