From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 28 Feb 2016 07:34:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~463
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7531a36086295c02ccb2d78c41d355a424426607;p=collectd.git

Merge branch 'collectd-5.5'
---

7531a36086295c02ccb2d78c41d355a424426607