From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 22 Feb 2009 18:50:14 +0000 (+0100)
Subject: Merge branch 'master' into ff/java
X-Git-Tag: collectd-4.7.0~114^2~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=04b395325b152a5ddf424d1a750f455a2f8229fb;p=collectd.git

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

04b395325b152a5ddf424d1a750f455a2f8229fb