From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 1 Sep 2007 18:59:45 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.1.0~6^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a392d55f295710f97ce970d3931ffe545c41511f;p=collectd.git

Merge branch 'pull/master'
---

a392d55f295710f97ce970d3931ffe545c41511f