From: Florian Forster <octo@collectd.org>
Date: Fri, 25 Nov 2016 19:59:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/2052'
X-Git-Tag: collectd-5.7.0~28
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5917eb3d38171296d021351aba4e2601c8819bb7;hp=--cc;p=collectd.git

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

5917eb3d38171296d021351aba4e2601c8819bb7