From: Sven Trenkel <collectd@semidefinite.de>
Date: Sun, 16 Jul 2017 22:49:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'octo/master'
X-Git-Tag: collectd-5.8.0~33^2~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3a9c4019736178fb78e65389acaf97c84cdc3086;p=collectd.git

Merge remote-tracking branch 'octo/master'
---

3a9c4019736178fb78e65389acaf97c84cdc3086