From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 14 Apr 2017 12:32:01 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~10
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=42b8d7550d029ed9aef6f25e3eb2009c1f18b144

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

42b8d7550d029ed9aef6f25e3eb2009c1f18b144