From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 26 Oct 2007 08:08:28 +0000 (+0200)
Subject: Merge branch 'collectd-4.1'
X-Git-Tag: collectd-4.2.0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=054651e4798cc8b9170c17fc7d8884b1bb1d7a87;p=collectd.git

Merge branch 'collectd-4.1'
---

054651e4798cc8b9170c17fc7d8884b1bb1d7a87