From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 28 Feb 2016 00:08:16 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~466
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=28fa063b625c772f45c99b618f498715fb98474b;p=collectd.git

Merge branch 'collectd-5.5'
---

28fa063b625c772f45c99b618f498715fb98474b