From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 1 Jun 2017 18:37:49 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edcf39cc377d2de0744412209de4eeb50ca7ed5f;p=collectd.git

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

edcf39cc377d2de0744412209de4eeb50ca7ed5f