From: Florian Forster <octo@collectd.org>
Date: Thu, 28 Jul 2016 10:25:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1814'
X-Git-Tag: collectd-5.6.0~141
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3bfaa620f1a7f6653abccad7cb580b4fa2952f2f;p=collectd.git

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

3bfaa620f1a7f6653abccad7cb580b4fa2952f2f