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

Merge branch 'collectd-5.5'
---

0d80072344ea5322c34f716ed77a5319a62bfc96