From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 30 Apr 2008 06:18:21 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.4.0~23^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3da24ea8c48268a64025dc4aae5bdf223d7dad0c;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

3da24ea8c48268a64025dc4aae5bdf223d7dad0c