From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 30 Jun 2017 14:17:06 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~21
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e56c1e570ff8d4e8fe732f9d74f11217479fdd7b;hp=e56c1e570ff8d4e8fe732f9d74f11217479fdd7b;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---