From: Florian Forster <octo@collectd.org>
Date: Fri, 28 Oct 2016 11:44:05 +0000 (+0200)
Subject: Merge branch 'pr/2004'
X-Git-Tag: collectd-5.7.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d57d39331d6e4397763a480b1388b2c4a931a6da;p=thirdparty%2Fcollectd.git

Merge branch 'pr/2004'
---

d57d39331d6e4397763a480b1388b2c4a931a6da