From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 19 Oct 2007 07:23:57 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.2.0~22
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c8b0fd41dc6730981e4facf54c2e5f690f6c3c2f;p=collectd.git

Merge branch 'pull/master'
---

c8b0fd41dc6730981e4facf54c2e5f690f6c3c2f