Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 23:14:40 +0000 (01:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 23:14:40 +0000 (01:14 +0200)
commit9e5cdde4656070893ecf59c6234af0593bdda1a0
tree8303a0d3d7481994a330f034fe2697fc49b3ffee
parent705e2594b3e6ce864f05e88e7d1772fa0a85742c
parent079f487bae003575e360dcd6034546485f69b5c8
Merge branch 'collectd-5.4'
contrib/redhat/collectd.spec
src/bind.c
src/collectd-perl.pod
src/collectd.conf.in
src/collectd.conf.pod
src/curl.c
src/powerdns.c