From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 12 Oct 2007 20:33:11 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.2.0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=482d9fbe626c5efc756e64a991b0cdc181a28de0;p=collectd.git

Merge branch 'pull/master'
---

482d9fbe626c5efc756e64a991b0cdc181a28de0