From: Florian Forster <octo@collectd.org>
Date: Mon, 15 Aug 2016 17:57:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1879'
X-Git-Tag: collectd-5.6.0~15
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=88ad924df0622911c555cea6826933732e91d9cd;p=collectd.git

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

88ad924df0622911c555cea6826933732e91d9cd