Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 14:28:01 +0000 (16:28 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 14:28:01 +0000 (16:28 +0200)
commit6d8c3791a98eda82702ece14dbda46bc5f3de928
tree2c1f4ee4ccab98f7647144e80ec03ab3c14b24fd
parent1b15b227585497f72ab0e42d96d79c0313323bd4
parent1c4008c3216edbc9c7cbeffd1c597c9b32e8f64d
Merge branch 'collectd-5.5'
src/apache.c
src/curl_json.c
src/curl_xml.c
src/java.c
src/snmp.c