Merge branch 'collectd-5.6' into collectd-5.7
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 23 Jan 2017 19:05:30 +0000 (20:05 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 23 Jan 2017 19:05:30 +0000 (20:05 +0100)
1  2 
src/mqtt.c

diff --cc src/mqtt.c
Simple merge