From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 19 Mar 2016 15:44:05 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~32
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d9db39b8e8b5e9a34d955d057574f6ddd00759e6;hp=d9db39b8e8b5e9a34d955d057574f6ddd00759e6;p=collectd.git

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