Code

Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)
1  2 
src/network.c

diff --cc src/network.c
Simple merge