Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 10:33:46 +0000 (11:33 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 10:33:46 +0000 (11:33 +0100)
1  2 
src/sigrok.c
src/utils_format_json.c

diff --cc src/sigrok.c
Simple merge
Simple merge