Merge remote-tracking branch 'github/pr/1530'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Aug 2016 15:10:13 +0000 (17:10 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Aug 2016 15:10:13 +0000 (17:10 +0200)
1  2 
src/daemon/common.c

Simple merge