From: Florian Forster <octo@collectd.org>
Date: Mon, 12 Sep 2016 05:58:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1920'
X-Git-Tag: collectd-5.7.0~102
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2a9bdee896ac6372fb58288efaba3166bc4b6b6a;p=collectd.git

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

2a9bdee896ac6372fb58288efaba3166bc4b6b6a