From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 19 May 2015 16:37:19 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.5.0~12^2~4^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=967685afeaff2cb4f7e4f733f17df95363727c4f;hp=967685afeaff2cb4f7e4f733f17df95363727c4f;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.3
---