From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 23 Jan 2008 13:54:54 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=107a919d0d15d51d774c92ac72879d869e0fa4ee;p=collectd.git

Merge branch 'collectd-4.2'
---

107a919d0d15d51d774c92ac72879d869e0fa4ee