From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 19 May 2015 20:44:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~21
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=979b0fa58b2de639ff79209eff12ec17ff593483

Merge branch 'collectd-5.4'
---

979b0fa58b2de639ff79209eff12ec17ff593483