From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 15 Jan 2007 17:30:36 +0000 (+0100)
Subject: Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi... 
X-Git-Tag: collectd-4.0.0~232
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fae34a369b1001291ca7e1b51f364c42946698d4;p=collectd.git

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

fae34a369b1001291ca7e1b51f364c42946698d4