From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 18 Aug 2016 20:58:39 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.0~7
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3d74a63ae43c1786eb9b966e2209c24c5643dae8

Merge branch 'collectd-5.5' into collectd-5.6
---

3d74a63ae43c1786eb9b966e2209c24c5643dae8