From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 15 Jan 2016 16:19:31 +0000 (+0100)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.6.0~479
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ca4a6c8a856a9012270ec10389b08d54e70e3401

Merge branch 'collectd-5.4'
---

ca4a6c8a856a9012270ec10389b08d54e70e3401