From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 07:25:02 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~12^2~6
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=02c45fc2ecb087fb140e90217e5b701959306c1a;p=collectd.git

Merge branch 'collectd-5.3' into collectd-5.4
---

02c45fc2ecb087fb140e90217e5b701959306c1a