Merge branch 'pr/1792'
authorFlorian Forster <octo@collectd.org>
Thu, 15 Sep 2016 08:10:30 +0000 (10:10 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 15 Sep 2016 08:10:30 +0000 (10:10 +0200)
1  2 
src/daemon/common.c
src/daemon/common.h

Simple merge
Simple merge