Merge remote-tracking branch 'github/pr/2059'
authorFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 05:52:43 +0000 (06:52 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 05:52:43 +0000 (06:52 +0100)
1  2 
src/collectd.conf.pod
src/write_tsdb.c

Simple merge
Simple merge