Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 2 Jul 2017 18:52:18 +0000 (20:52 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 2 Jul 2017 18:52:18 +0000 (20:52 +0200)
1  2 
src/tcpconns.c

diff --cc src/tcpconns.c
Simple merge