From: Florian Forster <octo@collectd.org>
Date: Tue, 11 Oct 2016 06:36:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1980'
X-Git-Tag: collectd-5.7.0~52
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a5dc46700b069994d91b92fb46c8b2c2a1468c34;p=collectd.git

Merge remote-tracking branch 'github/pr/1980'
---

a5dc46700b069994d91b92fb46c8b2c2a1468c34