From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 23 Jan 2017 19:05:30 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~22
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=877672d20fcf0ed25f5fc5faa8aa3964c622bc27;p=collectd.git

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

877672d20fcf0ed25f5fc5faa8aa3964c622bc27