From: Florian Forster <octo@collectd.org>
Date: Tue, 6 Dec 2016 13:06:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/2080'
X-Git-Tag: collectd-5.8.0~281
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d0d3dedbd8435c8110ce1c860cfa3e97d31bad2;p=collectd.git

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

9d0d3dedbd8435c8110ce1c860cfa3e97d31bad2