From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 13 May 2008 14:58:11 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b88f9d8a83ff838523a21e4b191f447888d651cd;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

	contrib/cussh.pl
---

b88f9d8a83ff838523a21e4b191f447888d651cd