From: Florian Forster <octo@collectd.org>
Date: Mon, 19 Sep 2016 14:14:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1942'
X-Git-Tag: collectd-5.7.0~74
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4eee46d61a42706a4c9ccc4d4af9c6df30708216;p=collectd.git

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

4eee46d61a42706a4c9ccc4d4af9c6df30708216