Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:48:23 +0000 (09:48 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:48:23 +0000 (09:48 +0200)
1  2 
src/ethstat.c

diff --cc src/ethstat.c
Simple merge