From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 19 Jul 2006 16:52:20 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collectd
X-Git-Tag: collectd-3.11.0~73^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=df6f5e387b589b665f3be9099f6a27a84a805e09;p=collectd.git

Merge branch 'master' of /var/lib/git/collectd
---

df6f5e387b589b665f3be9099f6a27a84a805e09