From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 5 May 2008 14:44:11 +0000 (+0200)
Subject: Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
X-Git-Tag: collectd-4.4.0~14^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad8739289d8f254545f3426ec3a34ef30594db7c;p=collectd.git

Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
---

ad8739289d8f254545f3426ec3a34ef30594db7c