From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 07:40:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1403'
X-Git-Tag: collectd-5.6.0~525
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=038a4419b73292617931301375da0b5139f8c7be;p=collectd.git

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

038a4419b73292617931301375da0b5139f8c7be