Code

Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)
1  2 
configure.in
src/java.c

diff --cc configure.in
Simple merge
diff --cc src/java.c
Simple merge