From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 24 Oct 2007 17:21:33 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.2.0~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af1f4809cb0a26cdff94c9c84bd4accf0249a79a;p=collectd.git

Merge branch 'pull/master'
---

af1f4809cb0a26cdff94c9c84bd4accf0249a79a