From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 21 Jan 2008 10:12:29 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~34^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b7d9bc30c8853f75a50482ae14a74de31871cf6e;p=collectd.git

Merge branch 'collectd-4.2'
---

b7d9bc30c8853f75a50482ae14a74de31871cf6e