From: Florian Forster <octo@collectd.org>
Date: Fri, 25 Nov 2016 16:27:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/2054'
X-Git-Tag: collectd-5.7.0~29
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c3c79ddae53cd215947fbe923b36032f02be3c36

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

c3c79ddae53cd215947fbe923b36032f02be3c36