From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 7 Jun 2007 08:39:25 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~59
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b749dfcd251dfd7187dcf9ca76feb8befbc7d4cd;p=collectd.git

Merge branch 'collectd-4.0'
---

b749dfcd251dfd7187dcf9ca76feb8befbc7d4cd