From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Fri, 20 Oct 2017 14:00:29 +0000 (+0700)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~32
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0eff2a882a9265fd59d4f7a265c6b6810acb0032;p=collectd.git

Merge branch 'collectd-5.7'
---

0eff2a882a9265fd59d4f7a265c6b6810acb0032