Merge branch 'collectd-5.7' into collectd-5.8
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Nov 2017 21:15:11 +0000 (22:15 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Nov 2017 21:15:11 +0000 (22:15 +0100)
commit196f5bd17880d91ba0da33a8f5f6168d039cfa0c
treec28d0398e21ef28e1d003d27a22db711fe183220
parent6f5b7579b9ebe88da901b8ba5c50fc3793d2be73
parent19b51c4abd9dbff16fb69d7eb84422f31c6130bc
Merge branch 'collectd-5.7' into collectd-5.8