From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Nov 2016 11:39:33 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~299
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fe6da88c2eb1637ef6dce0a7d928c202ededc450;p=collectd.git

Merge branch 'collectd-5.7'
---

fe6da88c2eb1637ef6dce0a7d928c202ededc450