From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 13 Oct 2007 15:16:32 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.2.0~22^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=33e893df1a9d4243155b86dd32b7288cc0f04f18;p=collectd.git

Merge branch 'pull/master'
---

33e893df1a9d4243155b86dd32b7288cc0f04f18