From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 24 Feb 2009 09:16:19 +0000 (+0100)
Subject: Merge branch 'master' into ff/java
X-Git-Tag: collectd-4.7.0~114^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=45aa6a65c24e38c0a3fa3880a300fbb02db50486;p=collectd.git

Merge branch 'master' into ff/java
---

45aa6a65c24e38c0a3fa3880a300fbb02db50486