From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Nov 2016 14:47:53 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~298
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=176a71f2e7684c4c6ab279b199450d2e0e949161;p=collectd.git

Merge branch 'collectd-5.7'
---

176a71f2e7684c4c6ab279b199450d2e0e949161