From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 12 Jul 2017 16:58:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~18
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=01761867ced7bc5fe71546baf350be4a3e800600

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

01761867ced7bc5fe71546baf350be4a3e800600