From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 21:29:08 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~595
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=155102256542b6dab3261cd2d6dfb000354de425;p=collectd.git

Merge branch 'collectd-5.5'
---

155102256542b6dab3261cd2d6dfb000354de425