From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 10 Jan 2017 22:03:15 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~241
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=76fb10bf790e35dd6caca13c4bb5d0f86c517370

Merge branch 'collectd-5.7'
---

76fb10bf790e35dd6caca13c4bb5d0f86c517370