From: Florian Forster <octo@collectd.org>
Date: Mon, 13 Jul 2015 10:20:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1130'
X-Git-Tag: collectd-5.6.0~638
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ff17a1ce15e2bb1ea43c05974a17901ca43bc0d7;p=collectd.git

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

ff17a1ce15e2bb1ea43c05974a17901ca43bc0d7