From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 19 Jun 2007 19:43:42 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~47
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=63cbff115ba03717e81087d1419fc07c24d205c2

Merge branch 'collectd-4.0'
---

63cbff115ba03717e81087d1419fc07c24d205c2