From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 5 May 2009 18:30:10 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.0~20
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=139dd00301131050db32bf0cb08333aa7440c817;p=collectd.git

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

139dd00301131050db32bf0cb08333aa7440c817