From: Florian Forster <octo@collectd.org>
Date: Thu, 6 Oct 2016 20:41:24 +0000 (+0200)
Subject: Merge branch 'pr/1970'
X-Git-Tag: collectd-5.7.0~56
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=7f8a8111b26ffaed85a4a48ba874614df3a07f1b

Merge branch 'pr/1970'
---

7f8a8111b26ffaed85a4a48ba874614df3a07f1b