Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Sat, 18 Nov 2017 08:55:58 +0000 (09:55 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 18 Nov 2017 08:55:58 +0000 (09:55 +0100)
1  2 
src/gps.c
src/snmp.c
src/write_riemann.c

diff --cc src/gps.c
Simple merge
diff --cc src/snmp.c
Simple merge
Simple merge