From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 11 Aug 2016 16:40:40 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec9ed6fe4108f7fd3d4ef84e887bb6d3dc022e14;p=collectd.git

Merge branch 'collectd-5.5'
---

ec9ed6fe4108f7fd3d4ef84e887bb6d3dc022e14