From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sun, 28 Feb 2016 07:33:10 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~59
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d13532642c934667697842e4ff021e070ddf34d;p=collectd.git

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

6d13532642c934667697842e4ff021e070ddf34d