From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 12 Dec 2007 08:05:55 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.3.0beta0~64
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f46cf590f7e0a25fe5f826b762766f39e1f3a1f6;p=collectd.git

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

f46cf590f7e0a25fe5f826b762766f39e1f3a1f6