From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 30 Nov 2015 21:58:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~40
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f701e685eab83f37ecc6501d7dbe4eb941a454bb;p=collectd.git

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

f701e685eab83f37ecc6501d7dbe4eb941a454bb