From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 1 Jun 2017 18:38:17 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~148
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=47c86ace348a1d7a5352a83d10935209f89aa4f5;p=collectd.git

Merge branch 'collectd-5.7'
---

47c86ace348a1d7a5352a83d10935209f89aa4f5