Merge branch 'collectd-5.4' into collectd-5.5
authorPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 6 Nov 2015 09:32:55 +0000 (10:32 +0100)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 6 Nov 2015 09:32:55 +0000 (10:32 +0100)
1  2 
src/statsd.c

diff --cc src/statsd.c
Simple merge