From: Florian Forster <octo@collectd.org>
Date: Thu, 27 Oct 2016 19:29:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/2001'
X-Git-Tag: collectd-5.7.0~46
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=538f8ff488573b173eee3f36a37c89b0c2b75321;p=collectd.git

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

538f8ff488573b173eee3f36a37c89b0c2b75321