From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 5 Dec 2016 18:49:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~291
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c7fa732db30f2886e64829047e8912bd84afb65f

Merge branch 'collectd-5.7'
---

c7fa732db30f2886e64829047e8912bd84afb65f