From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 18 Feb 2008 19:53:54 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0~5
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=4cf9eb921f5994d4515613efa8739ce445cfd9a1

Merge branch 'collectd-4.2'
---

4cf9eb921f5994d4515613efa8739ce445cfd9a1