From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 24 Oct 2007 18:11:05 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=87e0b48747170a355f6a703be523a7dbbfbd8549

Merge branch 'collectd-4.1'
---

87e0b48747170a355f6a703be523a7dbbfbd8549