From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 28 Feb 2007 15:14:34 +0000 (+0100)
Subject: Merge branch 'ff/vserver' into collectd-4
X-Git-Tag: collectd-4.0.0-rc4~84
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=84e361e1a1db996254ed27ecb888c45489abc297;p=collectd.git

Merge branch 'ff/vserver' into collectd-4
---

84e361e1a1db996254ed27ecb888c45489abc297