From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 9 Jan 2017 10:42:21 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.1~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d3be3ed7cb69be4a9a256449d4885d4a55399de0

Merge branch 'collectd-5.6' into collectd-5.7
---

d3be3ed7cb69be4a9a256449d4885d4a55399de0