Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:44:55 +0000 (17:44 +0100)
1  2 
configure.ac
src/daemon/common.c
src/daemon/common.h

diff --cc configure.ac
Simple merge
Simple merge
Simple merge