From: Florian Forster <octo@collectd.org>
Date: Thu, 22 Dec 2016 09:57:57 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~261
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=786a6be461cf58ef2b8c57974cad2a79ba2ee82c;p=collectd.git

Merge branch 'collectd-5.7'
---

786a6be461cf58ef2b8c57974cad2a79ba2ee82c