From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 2 Jul 2017 18:52:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~129
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=867ad628dc6fcd05bd584b605d7093cfc00c3d07

Merge branch 'collectd-5.7'
---

867ad628dc6fcd05bd584b605d7093cfc00c3d07