From: Florian Forster <octo@collectd.org>
Date: Wed, 2 Nov 2016 08:36:48 +0000 (+0100)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~37
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c442c66d9e98852f1b8eaa1b816d6ee7f84d0342;p=collectd.git

Merge branch 'collectd-5.6'
---

c442c66d9e98852f1b8eaa1b816d6ee7f84d0342