From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 24 Feb 2017 16:44:55 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~14
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=11c8a760c2d354b2f4637bdb297efb253bfaa519;hp=11c8a760c2d354b2f4637bdb297efb253bfaa519;p=collectd.git

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