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

Merge branch 'collectd-5.5'
---

f0b5610723ae8962ae264f84210f8bac483bcd20