From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 28 Feb 2009 09:35:17 +0000 (+0100)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~128
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0e36ca16a2e53e01cbc08ee9b4b9d26176022786;p=collectd.git

Merge branch 'collectd-4.6'
---

0e36ca16a2e53e01cbc08ee9b4b9d26176022786