Merge remote-tracking branch 'github/pr/1956'
authorFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 13:23:05 +0000 (15:23 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 13:23:05 +0000 (15:23 +0200)
1  2 
src/dpdkstat.c

diff --cc src/dpdkstat.c
Simple merge