From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 18 Feb 2009 17:46:40 +0000 (+0100)
Subject: Merge branch 'master' into ff/java
X-Git-Tag: collectd-4.7.0~127^2~48
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b9646aa15a6bfa96239b1e0775ef2e87a1be5676;p=collectd.git

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

b9646aa15a6bfa96239b1e0775ef2e87a1be5676