From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 25 May 2016 14:13:10 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abc30f241619b3eb66c801c324390e1e9e6e001f;p=collectd.git

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

abc30f241619b3eb66c801c324390e1e9e6e001f