Code

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)
commita359afebf9e55cdb46b445e3d46d728a4d6fe992
tree50a421bbb247006cdadf3dd6aabf705f15a414ab
parent0c004681a480e919b779584814eb396f6e6948ca
parent3ec8f4d3d019658e3047855b6b71436b60c6a3b4
Merge branch 'collectd-5.4' into collectd-5.5
src/sigrok.c
src/utils_format_json.c