From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 15 Jan 2016 16:19:41 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~478
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9c8f3110063cf83fa146929d5f28f8ecf17a4ffd;p=collectd.git

Merge branch 'collectd-5.5'
---

9c8f3110063cf83fa146929d5f28f8ecf17a4ffd