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)
commita24baf2ad70837ea46cacbfee6e03537cf284ad5
treeeb20704b80f946a0c107d807af7164bdce073107
parent86d38d88547bd38bcb0e5a450508f1bcfc14c810
parent589c5f25f9cb723575fa16dd22e73dc9e7af0cfd
Merge branch 'collectd-4.9' into collectd-4.10
configure.in
src/java.c