From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 28 Sep 2007 10:41:21 +0000 (+0200)
Subject: Merge branch 'ff/collection' into collectd-4.0
X-Git-Tag: collectd-4.0.9~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb660d244f59edb16bfbb268f9b4894f878cb771;p=collectd.git

Merge branch 'ff/collection' into collectd-4.0
---

bb660d244f59edb16bfbb268f9b4894f878cb771