Merge branch 'collectd-4.10'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 4 Jan 2011 11:42:23 +0000 (12:42 +0100)
commit0eff156c7816507fa1865b76e948574dd320fae0
tree0fd067cff28d4e1dd8c018a0f94f18ab5b80ea9d
parent19808b4489b7e096fe4b53446f33d917f0e16438
parenta24baf2ad70837ea46cacbfee6e03537cf284ad5
Merge branch 'collectd-4.10'
README
configure.in
src/curl_json.c
src/dns.c
src/java.c