From: kevin-laatz-intel <kevin.laatz@intel.com>
Date: Mon, 2 Jul 2018 14:51:04 +0000 (+0100)
Subject: Merge branch 'master' into fix_deprecated_func
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=74ee9a04ef5785b31d1acbfdcbcece3370668cfe;hp=74ee9a04ef5785b31d1acbfdcbcece3370668cfe;p=collectd.git

Merge branch 'master' into fix_deprecated_func
---