From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 27 Feb 2008 21:50:22 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.4.0~87
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d35dd47646956b011a75084a979fd7850cea9a6b;p=collectd.git

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

d35dd47646956b011a75084a979fd7850cea9a6b