From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 6 Nov 2015 08:40:56 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=142fb2ea490118e62f34df41f907ef1e58fb0be4;p=collectd.git

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

142fb2ea490118e62f34df41f907ef1e58fb0be4