Merge branch 'pr/1791'
authorFlorian Forster <octo@collectd.org>
Mon, 1 Aug 2016 09:12:48 +0000 (11:12 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 1 Aug 2016 09:12:48 +0000 (11:12 +0200)
1  2 
src/collectd.conf.pod
src/interface.c

Simple merge
diff --cc src/interface.c
Simple merge