Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)
commit40e77dd34f9a8466165a8b7d724faeb337c90414
treef50b07ecc90c2b27065561ce3f42a4e563369059
parentb35ef467c9c197dc481aaca9faeea703e60f379a
parentbf4061d7f280863130619559c95badce90fb8444
Merge branch 'collectd-5.4' into collectd-5.5
src/collectd.conf.in
src/collectd.conf.pod
src/curl_json.c
src/email.c
src/libcollectdclient/network.c
src/openvpn.c
src/perl.c
src/snmp.c