Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)
commiteab8493d114c7c209d90ac54edb7c8026c085747
tree8c640ea85a8d9bf8042d5d05aac41da02a034256
parent9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0
parent9ab0a540f2b0f2b0427c33e198ca06d60d959182
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
src/dns.c
src/exec.c
src/liboconfig/scanner.l
src/pf.c
src/utils_vl_lookup.c