From: Florian Forster <octo@noris.net>
Date: Mon, 5 May 2008 14:44:49 +0000 (+0200)
Subject: Merge branch 'collectd-4.4' of git://git.verplant.org/collectd into collectd-4.4
X-Git-Tag: collectd-4.4.0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c84dfcbfe5971d55fbcbc88a88f2845fbeb8dfb3;p=collectd.git

Merge branch 'collectd-4.4' of git://git.verplant.org/collectd into collectd-4.4
---

c84dfcbfe5971d55fbcbc88a88f2845fbeb8dfb3