From: Florian Forster <octo@collectd.org>
Date: Thu, 17 Dec 2015 09:02:09 +0000 (+0100)
Subject: Merge branch 'pr/1393'
X-Git-Tag: collectd-5.6.0~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0532336600cf2abe1d25af8fbf5ad3cf3b6b31e0;p=thirdparty%2Fcollectd.git

Merge branch 'pr/1393'
---

0532336600cf2abe1d25af8fbf5ad3cf3b6b31e0