From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 3 Sep 2007 14:00:23 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.0' into collectd-4.0
X-Git-Tag: collectd-4.1.1~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa39b2bf774bf297f6c1a3967764bd7d84e0a49f;p=thirdparty%2Fcollectd.git

Merge branch 'pull/collectd-4.0' into collectd-4.0
---

aa39b2bf774bf297f6c1a3967764bd7d84e0a49f