From: Florian Forster <octo@collectd.org>
Date: Thu, 26 Nov 2015 21:46:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1355'
X-Git-Tag: collectd-5.6.0~577
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=365d0cc032c8a5df45492cdfc1090984951e78db;p=collectd.git

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

365d0cc032c8a5df45492cdfc1090984951e78db