From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:30:43 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b62e76ba5220c5279c29d970a65fa5a74dc1f145;p=collectd.git

Merge branch 'collectd-4.2'
---

b62e76ba5220c5279c29d970a65fa5a74dc1f145