From: Florian Forster <octo@collectd.org>
Date: Mon, 21 Nov 2016 07:33:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/2040'
X-Git-Tag: collectd-5.7.0~32
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c5ffa797883f238776e6294054f260df3cd0aea6

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

c5ffa797883f238776e6294054f260df3cd0aea6