Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)
1  2 
src/network.c

diff --cc src/network.c
Simple merge