From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 14 Mar 2009 17:52:38 +0000 (+0100)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~117
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d37ebe6eb6dd2bbf8213a924dfbce6e91945aab8;p=collectd.git

Merge branch 'collectd-4.6'
---

d37ebe6eb6dd2bbf8213a924dfbce6e91945aab8