From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 4 May 2009 15:13:08 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.0~26
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=cad58fa441765c7a3e8868a0938a3b221bb307cc;p=collectd.git

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

cad58fa441765c7a3e8868a0938a3b221bb307cc