From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 12 Jan 2016 08:03:09 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=40e77dd34f9a8466165a8b7d724faeb337c90414;p=collectd.git

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

40e77dd34f9a8466165a8b7d724faeb337c90414