Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:26:17 +0000 (11:26 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:26:17 +0000 (11:26 +0100)
1  2 
src/ping.c

diff --cc src/ping.c
Simple merge