From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 2 May 2016 19:57:56 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~307
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=12f249b209d7fa31e3a9d53315e47a2342463e0f;p=collectd.git

Merge branch 'collectd-5.5'
---

12f249b209d7fa31e3a9d53315e47a2342463e0f