From: Florian Forster <octo@collectd.org>
Date: Sat, 28 Nov 2015 06:56:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1366'
X-Git-Tag: collectd-5.6.0~574
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a1e7183991a922b4eeca02aafaf45cd675688570;p=collectd.git

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

a1e7183991a922b4eeca02aafaf45cd675688570