From: Florian Forster <octo@collectd.org>
Date: Tue, 16 May 2017 17:36:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~177
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a6f29de68fe19614b0aa90e920e99d72cb0f4468;p=collectd.git

Merge branch 'collectd-5.7'
---

a6f29de68fe19614b0aa90e920e99d72cb0f4468