From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 12 Sep 2007 12:57:43 +0000 (+0200)
Subject: Merge branch 'collectd-4.0' into collectd-4.1
X-Git-Tag: collectd-4.1.1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=refs%2Ftags%2Fcollectd-4.1.1;p=collectd.git

Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

	contrib/PerlLib/Collectd.pm

nothing added to commit but untracked files present (use "git add" to track)
---

97deb523823b1f04880d584a19bc2b0e7e10d96a