From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 7 Aug 2015 08:14:17 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~68
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

9ad5eefaa9dcc557c9117f8692cec1792f7ac7f0