Code

Merge branch 'collectd-4.7'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:53:07 +0000 (10:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 17 Aug 2009 08:53:07 +0000 (10:53 +0200)
1  2 
src/java.c

diff --cc src/java.c
Simple merge