From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Aug 2016 18:51:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1396'
X-Git-Tag: collectd-5.6.0~96
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=da62514318db2acc388403c92dc3cbfabec919bb;p=collectd.git

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

da62514318db2acc388403c92dc3cbfabec919bb