From: Florian Forster <octo@noris.net>
Date: Tue, 30 Oct 2007 16:19:41 +0000 (+0000)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~124
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=682dfca77df320c3b6d014074ab230009abf9098;p=collectd.git

Merge branch 'collectd-4.2'
---

682dfca77df320c3b6d014074ab230009abf9098