Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)
1  2 
src/libcollectdclient/network_buffer.c
src/network.c

diff --cc src/network.c
Simple merge