From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 28 Feb 2009 09:35:58 +0000 (+0100)
Subject: Merge branch 'ff/java'
X-Git-Tag: collectd-4.7.0~114
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43066b1c460921d4d4b8f609c26fd09afad56a1f;p=collectd.git

Merge branch 'ff/java'
---

43066b1c460921d4d4b8f609c26fd09afad56a1f