From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 26 Mar 2016 18:55:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~374
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43ef00c0eb99991902d3c9a5fbe582cde049b055;p=collectd.git

Merge branch 'collectd-5.5'
---

43ef00c0eb99991902d3c9a5fbe582cde049b055