From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Mar 2017 16:14:53 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ffaf9b893b6042a76e1c0dadd83ce06904fcc89a

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

ffaf9b893b6042a76e1c0dadd83ce06904fcc89a