From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 21:21:49 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~63
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=649eff4e6f96ba72d693c1442acaa62abdf965e0;p=collectd.git

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

649eff4e6f96ba72d693c1442acaa62abdf965e0