From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 20 Feb 2009 10:13:38 +0000 (+0100)
Subject: Merge branch 'ff/java' of /var/lib/git/collectd into ff/java
X-Git-Tag: collectd-4.7.0~127^2~41
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b2bf65d02a4c5d35e1d01f2e2f0e1dc2a1b3995b;p=collectd.git

Merge branch 'ff/java' of /var/lib/git/collectd into ff/java
---

b2bf65d02a4c5d35e1d01f2e2f0e1dc2a1b3995b