Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)
commit1ecde57a53fc7c50e6b0139ad745b868413d420c
treef91c18903ff6da06da59415e024dd8adb396b025
parent746faef9ffc8c263382356ada9a008564f5288b4
parent8339b50c3c2c4ca61e87a43a62c23bd53271a4ad
Merge branch 'collectd-5.7'