From: Pavel Rochnyack <pavel2000@ngs.ru>
Date: Fri, 20 Oct 2017 13:54:09 +0000 (+0700)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~8
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=55ffaf9ad7c8b180ac0192adb1a6ff6adc72c5a3;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---

55ffaf9ad7c8b180ac0192adb1a6ff6adc72c5a3