From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 2 May 2016 14:14:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~309
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=21058a13ed34ade6d2de0f54e4216b255d033af1;p=collectd.git

Merge branch 'collectd-5.5'
---

21058a13ed34ade6d2de0f54e4216b255d033af1