From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 26 Oct 2016 17:33:44 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~47
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e1fda36ff7e4b5f508b630b614b182e298d91fb7;p=collectd.git

Merge branch 'collectd-5.6'
---

e1fda36ff7e4b5f508b630b614b182e298d91fb7