From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 14 Apr 2017 12:34:20 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~195
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2b4445ea9b4b978468d75864f98e8137ba628dec

Merge branch 'collectd-5.7'
---

2b4445ea9b4b978468d75864f98e8137ba628dec