From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 14 Sep 2015 08:57:37 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~61
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=add25ce6f3129cb7138e96e5f55d11de1e5cf6de;p=collectd.git

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

add25ce6f3129cb7138e96e5f55d11de1e5cf6de